user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reduce chance of RUSTC collisions

Browse source
This commit is contained in:
Ralf Jung 2022-07-21 09:36:59 -04:00
parent 7cd1d78a47
commit 929712c49c
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cargo-miri/bin.rs
View file

@ -671,7 +671,10 @@ fn phase_cargo_miri(mut args: env::Args) {
// (https://github.com/rust-lang/cargo/issues/10885). There is no good way to single out these invocations;
// some build scripts use the RUSTC env var as well. So we set it directly to the `miri` driver and
// hope that all they do is ask for the version number -- things could quickly go downhill from here.
cmd.env("RUSTC", &find_miri());
// In `main`, we need the value of `RUSTC` to distinguish RUSTC_WRAPPER invocations from rustdoc
// or TARGET_RUNNER invocations, so we canonicalize it here to make it exceedingly unlikely that
// there would be a collision.
cmd.env("RUSTC", &fs::canonicalize(find_miri()).unwrap());
let runner_env_name =
|triple: &str| format!("CARGO_TARGET_{}_RUNNER", triple.to_uppercase().replace('-', "_"));