From: Bob Wilson <bob.wilson@apple.com>
Date: Thu, 27 Jun 2013 06:09:14 +0000 (+0000)
Subject: Add CXXFLAGS back to the Link command.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=105b1c818118233a23efe6265598d6b63f6fea33;p=oota-llvm.git

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
---

diff --git a/Makefile.rules b/Makefile.rules
index ade5f1a8f75..f0725502832 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)