Skip to content

Commit 03de7fd

Browse files
committed
install and use xargo inside the build dir
1 parent 05aa983 commit 03de7fd

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/bootstrap/test.rs

+4
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,10 @@ impl Step for Miri {
415415
cargo.env("RUSTC_DEBUG_ASSERTIONS", "false");
416416
// Debug things.
417417
cargo.env("RUST_BACKTRACE", "1");
418+
// Configure `cargo install` path, and let cargo-miri know that that's where
419+
// xargo ends up.
420+
cargo.env("CARGO_INSTALL_ROOT", &builder.out); // cargo adds a `bin/`
421+
cargo.env("XARGO", builder.out.join("bin").join("xargo"));
418422

419423
if !try_run(builder, &mut cargo) {
420424
return;

0 commit comments

Comments
 (0)