aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Christopher <echristo@apple.com>2009-08-18 18:07:35 +0000
committerEric Christopher <echristo@apple.com>2009-08-18 18:07:35 +0000
commitd604b256d50132ce41cec934ded7b708bd580329 (patch)
treea3dc2b45c0626b84aff956cf7dcf7c4f301ad97a
parent934d61648b61a9775642b8db9ed42f0e92a28b57 (diff)
downloadllvm-d604b256d50132ce41cec934ded7b708bd580329.zip
llvm-d604b256d50132ce41cec934ded7b708bd580329.tar.gz
llvm-d604b256d50132ce41cec934ded7b708bd580329.tar.bz2
Add CXXFLAGS to the Link lines as well in case someone used those instead
of LDFLAGS. llvm-svn: 79352
-rw-r--r--llvm/Makefile.rules5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index 4452bc8..8cc6558 100644
--- a/llvm/Makefile.rules
+++ b/llvm/Makefile.rules
@@ -640,7 +640,8 @@ ifeq ($(BUILD_COMPONENT), 1)
$(TargetCommonOpts) $(CompileCommonOpts) -c
Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \
$(CompileCommonOpts) $(CXX.Flags) -E
- Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(LDFLAGS) \
+ Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
+ $(LDFLAGS) \
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
else
Compile.C = $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
@@ -649,7 +650,7 @@ else
$(TargetCommonOpts) $(CompileCommonOpts) -c
Preprocess.CXX= $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
$(CompileCommonOpts) $(CXX.Flags) -E
- Link = $(CXX) $(CPP.Flags) $(CXX.Flags) $(LDFLAGS) \
+ Link = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LDFLAGS) \
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
endif