summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2006-05-16 06:51:02 +0000
committerReid Spencer <rspencer@reidspencer.com>2006-05-16 06:51:02 +0000
commitc14c936c79c60c9857d1b864cda029eded2a5d10 (patch)
treebc4fe5fcc713561a5c9006e7fdd8a534a31567ab /Makefile.rules
parentf3af4ff0053cc831650ea917c01a4c2680c8974e (diff)
downloadllvm-c14c936c79c60c9857d1b864cda029eded2a5d10.tar.gz
llvm-c14c936c79c60c9857d1b864cda029eded2a5d10.tar.bz2
llvm-c14c936c79c60c9857d1b864cda029eded2a5d10.tar.xz
Make sure that $(CXX.Flags) is passed to the linker so that the same options
with which source is compiled are used when linking. This matters when a project is using the LLVM makefiles and overrides CXXFLAGS to specify new flags to use. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28322 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 51826d527f..aa61380aaf 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -396,9 +396,9 @@ BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CompileCommonOpts) \
$(CXX.Flags)
Preprocess.CXX= $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -E
Link = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
- $(CompileCommonOpts) $(LD.Flags) $(Strip)
+ $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags) $(Strip)
Relink = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
- $(CompileCommonOpts) $(Relink.Flags)
+ $(CXX.Flags) $(CompileCommonOpts) $(Relink.Flags)
LTInstall = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL) \
$(Install.Flags)
ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755