diff options
| author | Ralf Jung <post@ralfj.de> | 2019-08-03 14:30:57 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2019-08-08 19:31:46 +0200 |
| commit | 03de7fdbfacb176394c257e7ce921466c1af378c (patch) | |
| tree | c47deed1089fa8178d3107fe3e0e643c5e953402 /src | |
| parent | 05aa983f4c3fa10de98be229451b32fdd5fa7c49 (diff) | |
| download | rust-03de7fdbfacb176394c257e7ce921466c1af378c.tar.gz rust-03de7fdbfacb176394c257e7ce921466c1af378c.zip | |
install and use xargo inside the build dir
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/test.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 8b8b38b1509..1850d60f139 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -415,6 +415,10 @@ impl Step for Miri { cargo.env("RUSTC_DEBUG_ASSERTIONS", "false"); // Debug things. cargo.env("RUST_BACKTRACE", "1"); + // Configure `cargo install` path, and let cargo-miri know that that's where + // xargo ends up. + cargo.env("CARGO_INSTALL_ROOT", &builder.out); // cargo adds a `bin/` + cargo.env("XARGO", builder.out.join("bin").join("xargo")); if !try_run(builder, &mut cargo) { return; |