[llvm-commits] CVS: llvm/Makefile.rules

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.366 -> 1.367
---
Log message:

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.


---
Diffs of the changes:  (+3 -3)

 Makefile.rules |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.366 llvm/Makefile.rules:1.367
--- llvm/Makefile.rules:1.366	Wed May 10 22:10:15 2006
+++ llvm/Makefile.rules	Tue May 16 01:25:14 2006
@@ -641,7 +641,7 @@
 #---------------------------------------------------------
 # 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 @@
 
 $(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)