From 03de7fdbfacb176394c257e7ce921466c1af378c Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 3 Aug 2019 14:30:57 +0200
Subject: [PATCH] install and use xargo inside the build dir

---
 src/bootstrap/test.rs | 4 ++++
 1 file changed, 4 insertions(+)

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 @@ fn run(self, builder: &Builder<'_>) {
             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;
-- 
GitLab