diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2015-06-01 23:21:00 +0000 |
|---|---|---|
| committer | jljusten <jljusten@Edk2> | 2015-06-01 23:21:00 +0000 |
| commit | c85bc0c9d425c04055496fd2111e12ab3471ef31 (patch) | |
| tree | 8b1808cbfc9124ac744bace1ee30cacab05bfab5 | |
| parent | d4848bb9df060fec042db4d216642f7c3e963d1b (diff) | |
| download | edk2-c85bc0c9d425c04055496fd2111e12ab3471ef31.tar.gz edk2-c85bc0c9d425c04055496fd2111e12ab3471ef31.tar.bz2 edk2-c85bc0c9d425c04055496fd2111e12ab3471ef31.zip | |
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 <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17544 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | BaseTools/Conf/build_rule.template | 4 | ||||
| -rw-r--r-- | BaseTools/Conf/tools_def.template | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index f1edf3a2f4..e5467cc455 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -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)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index ad34a3d6ee..fd7b4b55e8 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -6276,7 +6276,7 @@ NOOPT_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT # 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 @@ RELEASE_XCODE32_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-inter # 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 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os *_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 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC #################
# Build rule order
#################
-*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s
|