diff options
| author | Vytautas Astrauskas <vastrauskas@gmail.com> | 2021-07-31 18:02:28 +0200 |
|---|---|---|
| committer | Vytautas Astrauskas <vastrauskas@gmail.com> | 2021-07-31 18:03:52 +0200 |
| commit | 25a7c3b73340d7339c6921b1bbabd09b07c2947a (patch) | |
| tree | 8b187afe3e2dc930d76bed6708a9541dd0e65678 | |
| parent | e5e6acdd006bd1479951e192e189f491cef5f11b (diff) | |
| download | rust-25a7c3b73340d7339c6921b1bbabd09b07c2947a.tar.gz rust-25a7c3b73340d7339c6921b1bbabd09b07c2947a.zip | |
Fix obtain-borrowck failure on MSVC.
| -rw-r--r-- | src/test/run-make-fulldeps/obtain-borrowck/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/test/run-make-fulldeps/obtain-borrowck/Makefile b/src/test/run-make-fulldeps/obtain-borrowck/Makefile index c395ed59817..39832c4c79b 100644 --- a/src/test/run-make-fulldeps/obtain-borrowck/Makefile +++ b/src/test/run-make-fulldeps/obtain-borrowck/Makefile @@ -9,9 +9,15 @@ include ../tools.mk DRIVER_BINARY := "$(TMPDIR)"/driver SYSROOT := $(shell $(RUSTC) --print sysroot) +ifdef IS_MSVC +LIBSTD := -L "$(SYSROOT)\\lib\\rustlib\\$(TARGET)\\lib" +else +LIBSTD := +endif + all: $(RUSTC) driver.rs -o "$(DRIVER_BINARY)" - $(TARGET_RPATH_ENV) "$(DRIVER_BINARY)" --sysroot $(SYSROOT) test.rs -o "$(TMPDIR)/driver_test" > "$(TMPDIR)"/output.stdout + $(TARGET_RPATH_ENV) "$(DRIVER_BINARY)" --sysroot $(SYSROOT) $(LIBSTD) test.rs -o "$(TMPDIR)/driver_test" > "$(TMPDIR)"/output.stdout ifdef RUSTC_BLESS_TEST cp "$(TMPDIR)"/output.stdout output.stdout |