forked from OSchip/llvm-project
Prepend LD.Flags before LDFLAGS to avoid overriding necessary paths.
Patch by Jack Howarth. llvm-svn: 127152
This commit is contained in:
parent
75f9498a7c
commit
bb8599ade5
|
@ -655,8 +655,8 @@ ifeq ($(BUILD_COMPONENT), 1)
|
||||||
Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \
|
Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \
|
||||||
$(CompileCommonOpts) $(CXX.Flags) -E
|
$(CompileCommonOpts) $(CXX.Flags) -E
|
||||||
Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
|
Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
|
||||||
$(LDFLAGS) \
|
$(LD.Flags) $(LDFLAGS) \
|
||||||
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
|
$(TargetCommonOpts) $(CompileCommonOpts) $(Strip)
|
||||||
else
|
else
|
||||||
Compile.C = $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
|
Compile.C = $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
|
||||||
$(TargetCommonOpts) $(CompileCommonOpts) -c
|
$(TargetCommonOpts) $(CompileCommonOpts) -c
|
||||||
|
@ -664,8 +664,8 @@ else
|
||||||
$(TargetCommonOpts) $(CompileCommonOpts) -c
|
$(TargetCommonOpts) $(CompileCommonOpts) -c
|
||||||
Preprocess.CXX= $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
|
Preprocess.CXX= $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
|
||||||
$(CompileCommonOpts) $(CXX.Flags) -E
|
$(CompileCommonOpts) $(CXX.Flags) -E
|
||||||
Link = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LDFLAGS) \
|
Link = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LD.Flags) \
|
||||||
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
|
$(LDFLAGS) $(TargetCommonOpts) $(CompileCommonOpts) $(Strip)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BCCompile.C = $(LLVMCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
|
BCCompile.C = $(LLVMCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
|
||||||
|
|
Loading…
Reference in New Issue