diff options
| author | bors <bors@rust-lang.org> | 2024-03-26 07:47:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-26 07:47:32 +0000 |
| commit | 5f73da71fb16d5e4410dac3190ba95a0fb9afb2a (patch) | |
| tree | 90c8a2052b6684745801ae9d583bcca888b75786 | |
| parent | cf1eb93a02349d31f96ab2737b6f15cf6e6df534 (diff) | |
| parent | 377caa2afd81c3425ba9e82409ea25d5e9d593a8 (diff) | |
| download | rust-5f73da71fb16d5e4410dac3190ba95a0fb9afb2a.tar.gz rust-5f73da71fb16d5e4410dac3190ba95a0fb9afb2a.zip | |
Auto merge of #3417 - RalfJung:RUSTC_WORKSPACE_WRAPPER, r=RalfJung
we have to ignore RUSTC_WORKSPACE_WRAPPER as well This matches what we do with RUSTC_WRAPPER.
| -rw-r--r-- | src/tools/miri/cargo-miri/src/phases.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/tools/miri/cargo-miri/src/phases.rs b/src/tools/miri/cargo-miri/src/phases.rs index e547599d954..52f96a28c9d 100644 --- a/src/tools/miri/cargo-miri/src/phases.rs +++ b/src/tools/miri/cargo-miri/src/phases.rs @@ -179,6 +179,13 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) { ); } cmd.env("RUSTC_WRAPPER", &cargo_miri_path); + // There's also RUSTC_WORKSPACE_WRAPPER, which gets in the way of our own wrapping. + if env::var_os("RUSTC_WORKSPACE_WRAPPER").is_some() { + println!( + "WARNING: Ignoring `RUSTC_WORKSPACE_WRAPPER` environment variable, Miri does not support wrapping." + ); + } + cmd.env_remove("RUSTC_WORKSPACE_WRAPPER"); // We are going to invoke `MIRI` for everything, not `RUSTC`. if env::var_os("RUSTC").is_some() && env::var_os("MIRI").is_none() { println!( |