Rollup merge of #126238 - Nilstrieb:run,miri,run, r=RalfJung · rust-lang-ci/rust@24c94f0 (original) (raw)

File tree

1 file changed

lines changed

1 file changed

lines changed

Original file line number Diff line number Diff line change
@@ -149,12 +149,14 @@ impl Step for Miri {
149 149 &[],
150 150 );
151 151 miri.add_rustc_lib_path(builder);
152 -// Forward arguments.
153 152 miri.arg("--").arg("--target").arg(target.rustc_target_arg());
154 - miri.args(builder.config.args());
155 153
156 154 // miri tests need to know about the stage sysroot
157 - miri.env("MIRI_SYSROOT", &miri_sysroot);
155 + miri.arg("--sysroot").arg(miri_sysroot);
156 +
157 +// Forward arguments. This may contain further arguments to the program
158 +// after another --, so this must be at the end.
159 + miri.args(builder.config.args());
158 160
159 161 let mut miri = Command::from(miri);
160 162 builder.run(&mut miri);