From 9c9320426ef9d3970ae52fc314a3dab1936dbb83 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Mon, 7 Mar 2011 04:25:12 +0000 Subject: [PATCH] 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index c0a9112c31b..57198844f56 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -655,8 +655,8 @@ ifeq ($(BUILD_COMPONENT), 1) 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 @@ else $(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) \ -- 2.34.1