From ebdb6d4df73c244b4b6dae761c900db896263a89 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 21 Oct 2019 10:25:47 +0200
Subject: [PATCH] when xargo is manually specified, don't try to upgrade it

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

diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index cf513bc1d2..b889ce52f3 100644
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -259,6 +259,10 @@ fn setup(ask_user: bool) {
 
     // First, we need xargo.
     if xargo_version().map_or(true, |v| v < (0, 3, 16)) {
+        if std::env::var("XARGO").is_ok() {
+            // The user manually gave us a xargo binary; don't do anything automatically.
+            show_error(format!("Your xargo is too old; please upgrade to the latest version"))
+        }
         let mut cmd = cargo();
         cmd.args(&["install", "xargo", "-f"]);
         ask_to_run(cmd, ask_user, "install a recent enough xargo");