about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDiggory Blake <diggsey@googlemail.com>2015-08-06 04:47:15 +0100
committerDiggory Blake <diggsey@googlemail.com>2015-08-06 04:47:15 +0100
commit6203d97a86b654e162d059fd5a13537ecbe6ee05 (patch)
tree9ea9bb75a2504d7c07514032782c580744105568
parentd03456183e85fe7bd465bbe7c8f67885a2528444 (diff)
downloadrust-6203d97a86b654e162d059fd5a13537ecbe6ee05.tar.gz
rust-6203d97a86b654e162d059fd5a13537ecbe6ee05.zip
Fix setting of PATH for `make check` on windows
-rw-r--r--mk/tests.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/tests.mk b/mk/tests.mk
index 9341166beb0..28837e05195 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -95,7 +95,8 @@ ifdef CFG_WINDOWSY_$(1)
                $$(if $$(findstring stage3,$$(1)), \
                     stage3/$$(CFG_LIBDIR_RELATIVE), \
                )))))/rustlib/$$(CFG_BUILD)/lib
-  CFG_RUN_TEST_$(1)=$$(call CFG_RUN_$(1),$$(call CFG_TESTLIB_$(1),$$(1),$$(4)),$$(1))
+  CFG_RUN_TEST_$(1)=$$(TARGET_RPATH_VAR$$(2)_T_$$(3)_H_$$(4)) \
+	  $$(call CFG_RUN_$(1),$$(call CFG_TESTLIB_$(1),$$(1),$$(4)),$$(1))
 endif
 
 # Run the compiletest runner itself under valgrind