Skip to content

Commit 9301b3a

Browse files
committed
Auto merge of #1010 - RalfJung:xargo, r=RalfJung
when xargo is manually specified, don't try to upgrade it
2 parents cfd9599 + ebdb6d4 commit 9301b3a

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/bin/cargo-miri.rs

+4
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ fn setup(ask_user: bool) {
259259

260260
// First, we need xargo.
261261
if xargo_version().map_or(true, |v| v < (0, 3, 16)) {
262+
if std::env::var("XARGO").is_ok() {
263+
// The user manually gave us a xargo binary; don't do anything automatically.
264+
show_error(format!("Your xargo is too old; please upgrade to the latest version"))
265+
}
262266
let mut cmd = cargo();
263267
cmd.args(&["install", "xargo", "-f"]);
264268
ask_to_run(cmd, ask_user, "install a recent enough xargo");

0 commit comments

Comments
 (0)