[llvm-commits] CVS: llvm/test/Makefile.tests

John Criswell criswell at cs.uiuc.edu
Fri Jan 16 15:54:01 PST 2004


Changes in directory llvm/test:

Makefile.tests updated: 1.85 -> 1.86

---
Log message:

Remove the use of LLVMGCCARCH.  Instead, query the compiler for the
location of libgcc.a; that will tell us the name of the directory to find
the libraries that we're looking for.



---
Diffs of the changes:  (+4 -1)

Index: llvm/test/Makefile.tests
diff -u llvm/test/Makefile.tests:1.85 llvm/test/Makefile.tests:1.86
--- llvm/test/Makefile.tests:1.85	Tue Jan 13 16:22:19 2004
+++ llvm/test/Makefile.tests	Fri Jan 16 15:53:23 2004
@@ -34,11 +34,14 @@
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
+# Find the location of the platform specific LLVM GCC libraries
+LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))
+
 # LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules)
 LLI      = $(LLVMTOOLCURRENT)/lli
 LLC      = $(LLVMTOOLCURRENT)/llc
 LGCCAS   = $(LLVMTOOLCURRENT)/gccas
-LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCDIR)/lib/gcc/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
+LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib
 LDIS     = $(LLVMTOOLCURRENT)/llvm-dis 
 LOPT     = $(LLVMTOOLCURRENT)/opt
 LLINK    = $(LLVMTOOLCURRENT)/llvm-link





More information about the llvm-commits mailing list