user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #1010 - RalfJung:xargo, r=RalfJung

Browse source 
when xargo is manually specified, don't try to upgrade it
This commit is contained in:
bors 2019-10-21 08:45:54 +00:00
commit f912a8b054
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bin/cargo-miri.rs
View file

@ -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");