From e5367bfb614f9d4b56f3cf5d8fd16f367d0ea86d Mon Sep 17 00:00:00 2001 From: Andrew Fish Date: Wed, 10 Sep 2014 16:48:59 +0000 Subject: [PATCH] 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 Reviewed-by: Jordan Justen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16085 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Conf/tools_def.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 4c4db84592..af74d2557f 100644 --- 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 NOOPT_XCODE5_IA32_ASM_FLAGS = -arch i386 -g RELEASE_XCODE5_IA32_ASM_FLAGS = -arch i386 + *_XCODE5_IA32_NASM_FLAGS = -f macho32 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) @@ -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 NOOPT_XCODE5_X64_ASM_FLAGS = -arch x86_64 -g RELEASE_XCODE5_X64_ASM_FLAGS = -arch x86_64 + *_XCODE5_X64_NASM_FLAGS = -f macho64 *_XCODE5_*_PP_FLAGS = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h *_XCODE5_*_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h -- 2.39.2