Revision: 17544
http://sourceforge.net/p/edk2/code/17544
Author: jljusten
Date: 2015-06-01 23:21:00 +0000 (Mon, 01 Jun 2015)
Log Message:
-----------
BaseTools/Conf: Don't support upper case nasm extensions
For *.asm and *.s, there have been cases of *.Asm and *.S files, but
since the nasm extensions are new, we don't need to support the upper
case extensions.
In other words, remove .Nasm and .NASM.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Conf/build_rule.template
trunk/edk2/BaseTools/Conf/tools_def.template
Modified: trunk/edk2/BaseTools/Conf/build_rule.template
===================================================================
--- trunk/edk2/BaseTools/Conf/build_rule.template 2015-06-01 06:40:38 UTC
(rev 17543)
+++ trunk/edk2/BaseTools/Conf/build_rule.template 2015-06-01 23:21:00 UTC
(rev 17544)
@@ -194,7 +194,7 @@
[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
- ?.nasm, ?.Nasm, ?.NASM
+ ?.nasm
<ExtraDependency>
$(MAKE_FILE)
@@ -479,7 +479,7 @@
[Nasm-to-Binary-Code-File]
<InputFile>
- ?.nasmb, ?.NASMB
+ ?.nasmb
<ExtraDependency>
$(MAKE_FILE)
Modified: trunk/edk2/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/edk2/BaseTools/Conf/tools_def.template 2015-06-01 06:40:38 UTC
(rev 17543)
+++ trunk/edk2/BaseTools/Conf/tools_def.template 2015-06-01 23:21:00 UTC
(rev 17544)
@@ -6276,7 +6276,7 @@
# XCODE32 - Xcode 3.2 Tools (Snow Leopard)
*_XCODE32_*_*_FAMILY = GCC
*_XCODE32_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE32_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE32_*_*_BUILDRULEORDER = S s nasm
*_XCODE32_*_ASL_PATH = /usr/bin/iasl
@@ -6386,7 +6386,7 @@
# CLANG - clang that produce Mach-O with EFI x86_64 ABI
*_XCLANG_*_*_FAMILY = GCC
*_XCLANG_*_*_BUILDRULEFAMILY = XCODE
-*_XCLANG_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCLANG_*_*_BUILDRULEORDER = S s nasm
*_XCLANG_*_ASL_PATH = /usr/bin/iasl
@@ -6450,7 +6450,7 @@
*_XCODE5_*_*_FAMILY = GCC
*_XCODE5_*_*_BUILDRULEFAMILY = XCODE
-*_XCODE5_*_*_BUILDRULEORDER = S s nasm Nasm NASM
+*_XCODE5_*_*_BUILDRULEORDER = S s nasm
*_XCODE5_*_ASL_PATH = /usr/bin/iasl
@@ -6947,4 +6947,4 @@
#################
# Build rule order
#################
-*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
