diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2013-06-27 06:09:14 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2013-06-27 06:09:14 +0000 |
| commit | 105b1c818118233a23efe6265598d6b63f6fea33 (patch) | |
| tree | c712c896eeb2de28c8efc5a2910ea72b19e111a3 /Makefile.rules | |
| parent | 08ddd12e444880b4d570ac42a42414a227022190 (diff) | |
| download | llvm-105b1c818118233a23efe6265598d6b63f6fea33.tar.gz llvm-105b1c818118233a23efe6265598d6b63f6fea33.tar.bz2 llvm-105b1c818118233a23efe6265598d6b63f6fea33.tar.xz | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185060 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules index ade5f1a8f7..f072550283 100644 --- a/Makefile.rules +++ b/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) |