From ea64122ec5c61d8bdc64682b16a0bdbc4aadfa46 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Mon, 24 Jun 2013 23:20:04 +0000 Subject: Remove all non-linker oriented compile options from the linker command line. Change the darwin universal binary options to be TargetCommonOpts so that they'll be passed to the linker since -arch at least is still needed. Someone on darwin with a buildit based build should probably verify that this doesn't break anything there. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184793 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index 9cc6a2d..07b0220 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -691,9 +691,9 @@ ifdef UNIVERSAL UNIVERSAL_ARCH := i386 ppc endif UNIVERSAL_ARCH_OPTIONS := $(UNIVERSAL_ARCH:%=-arch %) - CompileCommonOpts += $(UNIVERSAL_ARCH_OPTIONS) + TargetCommonOpts += $(UNIVERSAL_ARCH_OPTIONS) ifdef UNIVERSAL_SDK_PATH - CompileCommonOpts += -isysroot $(UNIVERSAL_SDK_PATH) + TargetCommonOpts += -isysroot $(UNIVERSAL_SDK_PATH) endif # Building universal cannot compute dependencies automatically. @@ -755,8 +755,7 @@ Preprocess.CXX= $(Compile.Wrapper) \ $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \ $(CompileCommonOpts) $(CXX.Flags) -E Link = $(Compile.Wrapper) \ - $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LD.Flags) \ - $(LDFLAGS) $(TargetCommonOpts) $(CompileCommonOpts) $(Strip) + $(CXX) $(LD.Flags) $(LDFLAGS) $(TargetCommonOpts) $(Strip) BCCompile.C = $(LLVMCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \ $(TargetCommonOpts) $(CompileCommonOpts) -- cgit v1.1