Skip to content

Commit 5f75375

Browse files
committed
Fix Miri sysroot for x run
Miri no longer respects `MIRI_SYSROOT` and wants to be treated like a REAL rustc, with `--sysroot`. *pats Miri* sure Miri, just for you :3.
1 parent a316785 commit 5f75375

File tree

1 file changed

+5
-4
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+5
-4
lines changed

src/bootstrap/src/core/build_steps/run.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,13 @@ impl Step for Miri {
149149
&[],
150150
);
151151
miri.add_rustc_lib_path(builder);
152-
// Forward arguments.
153-
miri.arg("--").arg("--target").arg(target.rustc_target_arg());
154-
miri.args(builder.config.args());
155152

156153
// miri tests need to know about the stage sysroot
157-
miri.env("MIRI_SYSROOT", &miri_sysroot);
154+
miri.arg("--sysroot").arg(miri_sysroot);
155+
miri.arg("--").arg("--target").arg(target.rustc_target_arg());
156+
157+
// Forward arguments.
158+
miri.args(builder.config.args());
158159

159160
let mut miri = Command::from(miri);
160161
builder.run(&mut miri);

0 commit comments

Comments
 (0)