From ab519972fad1683c782b35d720480366ed4caf8d Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Tue, 16 May 2006 06:25:14 +0000 Subject: When linking, make sure the project libraries are linked before the LLVM libraries. This ensures that the project's libraries (which most likely depend on LLVM libraries) come first on the command line and can thus be resolved by the LLVM libraries that appear later. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28316 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index aa9e592d0d..203bccf763 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -641,7 +641,7 @@ endif #--------------------------------------------------------- # Some versions of gcc on Alpha produce too many symbols, so use a .a file ifeq ($(ARCH),Alpha) -USEDLIBS := $(subst LLVMCore, LLVMCore.a, $(USEDLIBS)) +USEDLIBS := $(subst LLVMCore, LLVMCore.a, $(USEDLIBS)) LLVMLIBS := $(subst LLVMCore, LLVMCore.a, $(LLVMLIBS)) CORE_IS_ARCHIVE := 1 else @@ -950,8 +950,8 @@ endif $(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) - $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(LLVMLibsOptions) \ - $(ProjLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) + $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ + $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) $(Echo) ======= Finished Linking $(BuildMode) Executable $(TOOLNAME) \ $(StripWarnMsg) -- cgit v1.2.3