From ec22bede67007028f2e49571f3fd67dcdbc08c84 Mon Sep 17 00:00:00 2001 From: Yingke Liu Date: Tue, 26 May 2015 10:32:47 +0000 Subject: [PATCH] BaseTools: Add default BuildRuleOrder in tools_def.template *_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s *_XCODE32_*_*_BUILDRULEORDER = S s nasm Nasm NASM *_XCLANG_*_*_BUILDRULEORDER = S s nasm Nasm NASM *_XCODE5_*_*_BUILDRULEORDER = S s nasm Nasm NASM Tool Chain in Mac Os will use S as the first priority. Other tool chains use nasm as the first priority. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yingke Liu Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17510 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Conf/tools_def.template | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 5e0c3d714b..ad34a3d6ee 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -6276,6 +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_*_ASL_PATH = /usr/bin/iasl @@ -6385,6 +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_*_ASL_PATH = /usr/bin/iasl @@ -6448,6 +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_*_ASL_PATH = /usr/bin/iasl @@ -6940,3 +6943,8 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC *_*_*_NASM_PATH = ENV(NASM_PREFIX)nasm # NASMB uses NASM produce a .bin from a .nasmb NASM source file *_*_*_NASMB_FLAGS = -f bin + +################# +# Build rule order +################# +*_*_*_*_BUILDRULEORDER = nasm Nasm NASM asm Asm ASM S s -- 2.39.2