about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-07-30 22:51:40 +0200
committerGitHub <noreply@github.com>2024-07-30 22:51:40 +0200
commit49327a04a2ceb81dd0ca420cb584d3557a2bd073 (patch)
treee5995eb74df3983ed1fb32dc4b3a32aab1ea10cb
parente6a82d287884615c2e411421fe8205ed2cf55a3a (diff)
parentcc7e7bc0964ed29963bb3c455f2b89c9e06c5a87 (diff)
Rollup merge of #128382 - RalfJung:cargo-miri-assert, r=oli-obk
cargo-miri: better error when we seem to run inside bootstrap but something is wrong

Cc https://github.com/rust-lang/miri/issues/3775
-rw-r--r--src/tools/miri/cargo-miri/src/setup.rs5
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);