diff options
| author | Eric Christopher <echristo@gmail.com> | 2013-06-24 23:20:04 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2013-06-24 23:20:04 +0000 |
| commit | 97e784a58808a220851235a7fba8d869ff686e1b (patch) | |
| tree | 8dad7d2201f66b98ae96e9ca83b3808685c8afa2 /llvm/Makefile.rules | |
| parent | 5fdd68e596c4ec73acb9f1fadb5877bf04f2ac3b (diff) | |
| download | bcm5719-llvm-97e784a58808a220851235a7fba8d869ff686e1b.tar.gz bcm5719-llvm-97e784a58808a220851235a7fba8d869ff686e1b.zip | |
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.
llvm-svn: 184793
Diffstat (limited to 'llvm/Makefile.rules')
| -rw-r--r-- | llvm/Makefile.rules | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index 9cc6a2d927c..07b022030c3 100644 --- a/llvm/Makefile.rules +++ b/llvm/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) |
