BaseTools: Fix XCODE5 to work properly with NASM

The default object type for NASM is raw binary, and this will not link.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Andrew Fish <afish@apple.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16085 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 4c4db84592741f971399c903285901397b65d670..af74d2557f8fa69edeae7fadc71b59d6192f392b 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -6478,6 +6478,7 @@ RELEASE_XCODE5_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$
   DEBUG_XCODE5_IA32_ASM_FLAGS  = -arch i386 -g\r
   NOOPT_XCODE5_IA32_ASM_FLAGS  = -arch i386 -g\r
 RELEASE_XCODE5_IA32_ASM_FLAGS  = -arch i386 \r
   DEBUG_XCODE5_IA32_ASM_FLAGS  = -arch i386 -g\r
   NOOPT_XCODE5_IA32_ASM_FLAGS  = -arch i386 -g\r
 RELEASE_XCODE5_IA32_ASM_FLAGS  = -arch i386 \r

+      *_XCODE5_IA32_NASM_FLAGS = -f macho32\r

 \r
 \r
   DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)\r
 \r
 \r
   DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)\r


@@ -6497,6 +6498,7 @@ RELEASE_XCODE5_X64_DLINK_FLAGS      = -arch x86_64 -u _$(IMAGE_ENTRY_POINT) -e _
   DEBUG_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g\r
   NOOPT_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g\r
 RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64 \r
   DEBUG_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g\r
   NOOPT_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g\r
 RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64 \r

+      *_XCODE5_X64_NASM_FLAGS = -f macho64\r

 *_XCODE5_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h \r
 *_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h \r
 \r
 *_XCODE5_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h \r
 *_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h \r
 \r