You know you like Makefiles with fewer variables. Next up on the victim list

is TOOLS, which is how you say LLVMTOOLCURRENT in Oldspeak.

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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 0e3a76901adaa8e5a87e582777ee1903961d4fcd..cb6fb666fd60c87fdb7aa87fe6d46802f0f43db5 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -34,18 +34,16 @@ endif
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
-TOOLS    = $(LLVMTOOLCURRENT)
-
 # LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules)
-LLI      = $(TOOLS)/lli
-LLC      = $(TOOLS)/llc
-LGCCAS   = $(TOOLS)/gccas
+LLI      = $(LLVMTOOLCURRENT)/lli
+LLC      = $(LLVMTOOLCURRENT)/llc
+LGCCAS   = $(LLVMTOOLCURRENT)/gccas
 LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCDIR)/lib/gcc/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
-LDIS     = $(TOOLS)/llvm-dis 
-LOPT     = $(TOOLS)/opt
-LLINK    = $(TOOLS)/llvm-link
-LANALYZE = $(TOOLS)/analyze
-LBUGPOINT= $(TOOLS)/bugpoint
+LDIS     = $(LLVMTOOLCURRENT)/llvm-dis 
+LOPT     = $(LLVMTOOLCURRENT)/opt
+LLINK    = $(LLVMTOOLCURRENT)/llvm-link
+LANALYZE = $(LLVMTOOLCURRENT)/analyze
+LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint
 
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall