Skip to content

Commit 1af31d4

Browse files
committed
Auto merge of #27553 - Diggsey:win-path-fix, r=alexcrichton
I have no idea how bors keeps working without this - I can only assume it's some peculiarity of how windows searches for DLLs. Without this change, running `make check` on windows will not correctly set PATH to include eg. `x86_64-pc-windows-gnu\stage1\bin\rustlib\x86_64-pc-windows-gnu\lib`, and when it tries to run eg. `stage1/test/stdtest-x86_64-pc-windows-gnu.exe`, it will fail because windows can't find the DLLs on which it relies. It seems to be just a mistake: when the equivalent was added for the branch that deals with unix-like platforms, the windows branch was left unchanged.
2 parents c756526 + 6203d97 commit 1af31d4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

mk/tests.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ ifdef CFG_WINDOWSY_$(1)
9595
$$(if $$(findstring stage3,$$(1)), \
9696
stage3/$$(CFG_LIBDIR_RELATIVE), \
9797
)))))/rustlib/$$(CFG_BUILD)/lib
98-
CFG_RUN_TEST_$(1)=$$(call CFG_RUN_$(1),$$(call CFG_TESTLIB_$(1),$$(1),$$(4)),$$(1))
98+
CFG_RUN_TEST_$(1)=$$(TARGET_RPATH_VAR$$(2)_T_$$(3)_H_$$(4)) \
99+
$$(call CFG_RUN_$(1),$$(call CFG_TESTLIB_$(1),$$(1),$$(4)),$$(1))
99100
endif
100101

101102
# Run the compiletest runner itself under valgrind

0 commit comments

Comments
 (0)