Skip to content

Commit 95473b8

Browse files
committed
Auto merge of #128413 - matthiaskrgr:rollup-nrfcvdq, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #128357 (Detect non-lifetime binder params shadowing item params) - #128367 (CI: rfl: build the generated doctests and documentation) - #128376 (Mark `Parser::eat`/`check` methods as `#[must_use]`) - #128379 (the output in stderr expects panic-unwind) - #128380 (make `///` doc comments compatible with naked functions) - #128382 (cargo-miri: better error when we seem to run inside bootstrap but something is wrong) - #128398 (tidy: Fix quote in error message) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 0cc1f4e + 2553c4a commit 95473b8

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

cargo-miri/src/setup.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@ pub fn setup(
100100
// for target crates.
101101
let cargo_miri_path = std::env::current_exe().expect("current executable path invalid");
102102
if env::var_os("RUSTC_STAGE").is_some() {
103-
assert!(env::var_os("RUSTC").is_some());
103+
assert!(
104+
env::var_os("RUSTC").is_some() && env::var_os("RUSTC_WRAPPER").is_some(),
105+
"cargo-miri setup is running inside rustc bootstrap but RUSTC or RUST_WRAPPER is not set"
106+
);
104107
command.env("RUSTC_REAL", &cargo_miri_path);
105108
} else {
106109
command.env("RUSTC", &cargo_miri_path);

0 commit comments

Comments
 (0)