aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/Makefile.tests8
1 files changed, 2 insertions, 6 deletions
diff --git a/test/Makefile.tests b/test/Makefile.tests
index 630bacfb9f..22796116d9 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -30,11 +30,7 @@ endif
.PRECIOUS: Output/%.llvm.bc
.PRECIOUS: Output/%.llvm
-ifdef ENABLE_OPTIMIZED
-TOOLS = $(BUILD_OBJ_ROOT)/tools/Release
-else
-TOOLS = $(BUILD_OBJ_ROOT)/tools/Debug
-endif
+TOOLS = $(LLVMTOOLCURRENT)
# LLVM Tool Definitions...
#
@@ -57,7 +53,7 @@ LCCFLAGS += -O2 -Wall
LCXXFLAGS += -O2 -Wall
LLCFLAGS =
FAILURE = $(LEVEL)/test/Failure.sh
-TESTRUNR = $(LEVEL)/test/TestRunner.sh
+TESTRUNR = PATH=$(LLVMTOOLCURRENT) $(LEVEL)/test/TestRunner.sh
# Native Tool Definitions
NATGCC = $(CC)