Skip to content

Commit 25a7c3b

Browse files
committed
Fix obtain-borrowck failure on MSVC.
1 parent e5e6acd commit 25a7c3b

File tree

1 file changed

+7
-1
lines changed
  • src/test/run-make-fulldeps/obtain-borrowck

1 file changed

+7
-1
lines changed

src/test/run-make-fulldeps/obtain-borrowck/Makefile

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ include ../tools.mk
99
DRIVER_BINARY := "$(TMPDIR)"/driver
1010
SYSROOT := $(shell $(RUSTC) --print sysroot)
1111

12+
ifdef IS_MSVC
13+
LIBSTD := -L "$(SYSROOT)\\lib\\rustlib\\$(TARGET)\\lib"
14+
else
15+
LIBSTD :=
16+
endif
17+
1218
all:
1319
$(RUSTC) driver.rs -o "$(DRIVER_BINARY)"
14-
$(TARGET_RPATH_ENV) "$(DRIVER_BINARY)" --sysroot $(SYSROOT) test.rs -o "$(TMPDIR)/driver_test" > "$(TMPDIR)"/output.stdout
20+
$(TARGET_RPATH_ENV) "$(DRIVER_BINARY)" --sysroot $(SYSROOT) $(LIBSTD) test.rs -o "$(TMPDIR)/driver_test" > "$(TMPDIR)"/output.stdout
1521

1622
ifdef RUSTC_BLESS_TEST
1723
cp "$(TMPDIR)"/output.stdout output.stdout

0 commit comments

Comments
 (0)