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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10903 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile.tests b/test/Makefile.tests
index cb6fb666fd60c87fdb7aa87fe6d46802f0f43db5..13e62fd4bc5612038caa68406e287d73e05cbb32 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -34,11 +34,14 @@ endif
 .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