Skip to content

Commit

Permalink
Auto merge of #1010 - RalfJung:xargo, r=RalfJung
Browse files Browse the repository at this point in the history
when xargo is manually specified, don't try to upgrade it
  • Loading branch information
bors committed Oct 21, 2019
2 parents cfd9599 + ebdb6d4 commit f912a8b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/bin/cargo-miri.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit f912a8b

Please sign in to comment.