diff options
| author | Ralf Jung <post@ralfj.de> | 2024-07-30 12:12:41 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-07-30 12:13:04 +0200 |
| commit | cc7e7bc0964ed29963bb3c455f2b89c9e06c5a87 (patch) | |
| tree | 0c96749d64a721a4773e8f190e3be5b6011f5cf5 | |
| parent | 7e3a971870f23c94f7aceb53b490fb37333150ff (diff) | |
| download | rust-cc7e7bc0964ed29963bb3c455f2b89c9e06c5a87.tar.gz rust-cc7e7bc0964ed29963bb3c455f2b89c9e06c5a87.zip | |
cargo-miri: better error when we seem to run inside bootstrap but something is wrong
| -rw-r--r-- | src/tools/miri/cargo-miri/src/setup.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/miri/cargo-miri/src/setup.rs b/src/tools/miri/cargo-miri/src/setup.rs index fe67aad465c..0cf6f1a375c 100644 --- a/src/tools/miri/cargo-miri/src/setup.rs +++ b/src/tools/miri/cargo-miri/src/setup.rs @@ -100,7 +100,10 @@ pub fn setup( // for target crates. let cargo_miri_path = std::env::current_exe().expect("current executable path invalid"); if env::var_os("RUSTC_STAGE").is_some() { - assert!(env::var_os("RUSTC").is_some()); + assert!( + env::var_os("RUSTC").is_some() && env::var_os("RUSTC_WRAPPER").is_some(), + "cargo-miri setup is running inside rustc bootstrap but RUSTC or RUST_WRAPPER is not set" + ); command.env("RUSTC_REAL", &cargo_miri_path); } else { command.env("RUSTC", &cargo_miri_path); |