diff options
| author | bors <bors@rust-lang.org> | 2024-04-26 00:10:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-26 00:10:56 +0000 |
| commit | e59f2c544a0b0319c5e576e5b010afffa1b5c861 (patch) | |
| tree | 051069bd96bcf6235acd706376b68a4c033c42f3 /tests | |
| parent | 3a36386dc1075018dc7ca2640a2656adb31a61fe (diff) | |
| parent | 88eae3126150c389c9a5f997dea9f04d222c9ab1 (diff) | |
Auto merge of #124388 - compiler-errors:rollup-v17b8fm, r=compiler-errors
Rollup of 4 pull requests
Successful merges:
- #124076 (Stablise io_error_downcast)
- #124378 (Keep the LIB env var in the compiler-builtins test)
- #124379 (Remove special-casing for `SimplifiedType` for next solver)
- #124381 (Renamed `DerivedObligation` to `WellFormedDeriveObligation`)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/run-make/compiler-builtins/rmake.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/run-make/compiler-builtins/rmake.rs b/tests/run-make/compiler-builtins/rmake.rs index 92d6895143c..97ff12877f1 100644 --- a/tests/run-make/compiler-builtins/rmake.rs +++ b/tests/run-make/compiler-builtins/rmake.rs @@ -63,7 +63,10 @@ fn main() { .env("RUSTC", rustc) .env("RUSTFLAGS", "-Copt-level=0 -Cdebug-assertions=yes") .env("CARGO_TARGET_DIR", &target_dir) - .env("RUSTC_BOOTSTRAP", "1"); + .env("RUSTC_BOOTSTRAP", "1") + // Visual Studio 2022 requires that the LIB env var be set so it can + // find the Windows SDK. + .env("LIB", std::env::var("LIB").unwrap_or_default()); set_host_rpath(&mut cmd); let status = cmd.status().unwrap(); |