commit 9c9320426ef9d3970ae52fc314a3dab1936dbb83
author Eric Christopher <echristo@apple.com> Mon Mar 07 04:25:12 2011 +0000
committer Eric Christopher <echristo@apple.com> Mon Mar 07 04:25:12 2011 +0000
tree 5e312621ec6b7f9249dcb43c98ec46f2c2d0a4fd
parent bf433e5f46f6de9298bc072da6f02067198eff2a

Prepend LD.Flags before LDFLAGS to avoid overriding necessary paths.

Patch by Jack Howarth.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@127152 91177308-0d34-0410-b5e6-96231b3b80d8

Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index c0a9112..5719884 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -655,8 +655,8 @@
   Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \
                   $(CompileCommonOpts) $(CXX.Flags) -E
   Link          = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
-		  $(LDFLAGS) \
-                  $(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
+		  $(LD.Flags) $(LDFLAGS) \
+                  $(TargetCommonOpts) $(CompileCommonOpts) $(Strip)
 else
   Compile.C     = $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
                   $(TargetCommonOpts) $(CompileCommonOpts) -c
@@ -664,8 +664,8 @@
                   $(TargetCommonOpts) $(CompileCommonOpts) -c
   Preprocess.CXX= $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
                   $(CompileCommonOpts) $(CXX.Flags) -E
-  Link          = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LDFLAGS) \
-                  $(TargetCommonOpts)  $(CompileCommonOpts) $(LD.Flags) $(Strip)
+  Link          = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LD.Flags) \
+                  $(LDFLAGS) $(TargetCommonOpts)  $(CompileCommonOpts) $(Strip)
 endif
 
 BCCompile.C   = $(LLVMCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \