summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Wilson <bob.wilson@apple.com>2013-06-27 06:09:14 +0000
committerBob Wilson <bob.wilson@apple.com>2013-06-27 06:09:14 +0000
commit7abe25834a35a1e01579f90d972f160cede2b81e (patch)
treed07f2c4699e6d67801d0fb81dd2a07fa41b045b8
parent7ffacc4992129a8a8f2c6986c6bdc92802da91f9 (diff)
downloadbcm5719-llvm-7abe25834a35a1e01579f90d972f160cede2b81e.tar.gz
bcm5719-llvm-7abe25834a35a1e01579f90d972f160cede2b81e.zip
Add CXXFLAGS back to the Link command.
This is essentially reverting one piece of 184793 to try to fix one of Apple's buildbots. I will check with Eric to see if this is OK or if we need to find some other solution. llvm-svn: 185060
-rw-r--r--llvm/Makefile.rules3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index ade5f1a8f75..f0725502832 100644
--- a/llvm/Makefile.rules
+++ b/llvm/Makefile.rules
@@ -757,7 +757,8 @@ Preprocess.CXX= $(Compile.Wrapper) \
$(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
$(CompileCommonOpts) $(CXX.Flags) -E
Link = $(Compile.Wrapper) \
- $(CXX) $(LD.Flags) $(LDFLAGS) $(TargetCommonOpts) $(Strip)
+ $(CXX) $(CXXFLAGS) $(LD.Flags) $(LDFLAGS) \
+ $(TargetCommonOpts) $(Strip)
BCCompile.C = $(LLVMCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
$(TargetCommonOpts) $(CompileCommonOpts)
OpenPOWER on IntegriCloud