Skip to content

Commit

Permalink
Merge #291
Browse files Browse the repository at this point in the history
291: make xargo fail on non-nightly, instead of continuing with the wrong sysroot r=RalfJung a=RalfJung

This will likely just lead to failures later, so we better don't continue.

Co-authored-by: Ralf Jung <post@ralfj.de>
  • Loading branch information
bors[bot] and RalfJung committed May 11, 2020
2 parents d13d27b + 4aea49c commit 1414160
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,12 @@ fn run(cargo_mode: XargoMode) -> Result<Option<ExitStatus>> {
sysroot.src()?
},
Channel::Stable | Channel::Beta => {
writeln!(
io::stderr(),
"WARNING: the sysroot can't be built for the {:?} channel. \
eprintln!(
"ERROR: the sysroot can't be built for the {:?} channel. \
Switch to nightly.",
meta.channel
).ok();
return cargo::run(&args, verbose).map(Some);
);
process::exit(1);
}
};

Expand Down

0 comments on commit 1414160

Please sign in to comment.