From 0dab3d5ee167aadaebe4b32b035f6b3dc581538d Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 2 Aug 2019 18:02:54 +0200
Subject: [PATCH] honor CARGO env var (for rustc bootstrap)

---
 src/bin/cargo-miri.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index b46742efe72a..8dbb7573ba91 100644
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -231,7 +231,14 @@ fn setup(ask_user: bool) {
         } else {
             println!("Installing xargo: `cargo install xargo -f`");
         }
-        if !Command::new("cargo").args(&["install", "xargo", "-f"]).status().unwrap().success() {
+
+        let mut cargo = if let Ok(val) = std::env::var("CARGO") {
+            // In rustc bootstrap, an env var tells us where to find cargo.
+            Command::new(val)
+        } else {
+            Command::new("cargo")
+        };
+        if !cargo.args(&["install", "xargo", "-f"]).status().unwrap().success() {
             show_error(format!("Failed to install xargo"));
         }
     }