diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-07-23 19:42:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-23 19:42:34 +0200 |
| commit | 9d4daf88692e35a54fd198e0bff64558fe5e9310 (patch) | |
| tree | 1902874cf0cabd93eacf5db5716b44f5a41a02e9 /src | |
| parent | 84c257ebe5319ba68ce9a4ce5bca2d89e7127a14 (diff) | |
| parent | 3de52521aea47df85394c69559008f555fb3ed40 (diff) | |
| download | rust-9d4daf88692e35a54fd198e0bff64558fe5e9310.tar.gz rust-9d4daf88692e35a54fd198e0bff64558fe5e9310.zip | |
Rollup merge of #125886 - GuillaumeGomez:migrate-run-make-issue-15460, r=jieyouxu
Migrate run make issue 15460 Part of https://github.com/rust-lang/rust/issues/121876. r? `@jieyouxu` try-job: x86_64-msvc try-job: aarch64-apple try-job: x86_64-gnu-llvm-18
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/allowed_run_make_makefiles.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 16c08f709df..78c06551ff2 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -3378,6 +3378,7 @@ impl<'test> TestCx<'test> { cmd.env("IS_MSVC", "1") .env("IS_WINDOWS", "1") .env("MSVC_LIB", format!("'{}' -nologo", lib.display())) + .env("MSVC_LIB_PATH", format!("{}", lib.display())) .env("CC", format!("'{}' {}", self.config.cc, cflags)) .env("CXX", format!("'{}' {}", &self.config.cxx, cxxflags)); } else { @@ -3748,6 +3749,7 @@ impl<'test> TestCx<'test> { cmd.env("IS_MSVC", "1") .env("IS_WINDOWS", "1") .env("MSVC_LIB", format!("'{}' -nologo", lib.display())) + .env("MSVC_LIB_PATH", format!("{}", lib.display())) // Note: we diverge from legacy run_make and don't lump `CC` the compiler and // default flags together. .env("CC_DEFAULT_FLAGS", &cflags) diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index 158d5cc8ade..7efb7e2dae9 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -27,7 +27,6 @@ run-make/foreign-rust-exceptions/Makefile run-make/incr-add-rust-src-component/Makefile run-make/incr-foreign-head-span/Makefile run-make/interdependent-c-libraries/Makefile -run-make/issue-15460/Makefile run-make/issue-35164/Makefile run-make/issue-36710/Makefile run-make/issue-47551/Makefile |