Skip to content

Commit 2dc1412

Browse files
authored
Merge pull request #14 from rust-osdev/p
Error when trying to build with stable
2 parents add53b2 + 75659b7 commit 2dc1412

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
## [Unreleased]
77

8+
## [v0.5.0] - 2018-10-01
9+
- Error instead of warn when `cargo xbuild` is executed with a stable or beta compiler.
10+
811
## [v0.4.9] - 2018-08-20
912
- Add `cargo xclippy` command for invoking `cargo clippy`
1013

@@ -361,7 +364,8 @@ stage = 1
361364

362365
- Initial release
363366

364-
[Unreleased]: https://github.com/rust-osdev/cargo-xbuild/compare/v0.4.9...HEAD
367+
[Unreleased]: https://github.com/rust-osdev/cargo-xbuild/compare/v0.5.0...HEAD
368+
[v0.5.0]: https://github.com/rust-osdev/cargo-xbuild/compare/v0.4.9...v0.5.0
365369
[v0.4.9]: https://github.com/rust-osdev/cargo-xbuild/compare/v0.4.8...v0.4.9
366370
[v0.4.8]: https://github.com/rust-osdev/cargo-xbuild/compare/v0.4.7...v0.4.8
367371
[v0.4.7]: https://github.com/rust-osdev/cargo-xbuild/compare/v0.4.6...v0.4.7

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ keywords = ["cli", "cross", "compilation", "std", "osdev"]
88
license = "MIT OR Apache-2.0"
99
name = "cargo-xbuild"
1010
repository = "https://github.com/rust-osdev/cargo-xbuild"
11-
version = "0.4.9"
11+
version = "0.5.0"
1212

1313
[lib]
1414
name = "xargo_lib"

src/lib.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ fn run(command_name: &str) -> Result<Option<ExitStatus>> {
136136
}
137137
}
138138

139-
fn build(args: cli::Args, command_name: &str) -> Result<(ExitStatus)> {
139+
fn build(args: cli::Args, command_name: &str) -> Result<ExitStatus> {
140140
let verbose = args.verbose();
141141
let meta = rustc::version();
142142
let cd = CurrentDirectory::get()?;
@@ -161,13 +161,10 @@ fn build(args: cli::Args, command_name: &str) -> Result<(ExitStatus)> {
161161
sysroot.src()?
162162
},
163163
Channel::Stable | Channel::Beta => {
164-
writeln!(
165-
io::stderr(),
166-
"WARNING: the sysroot can't be built for the {:?} channel. \
164+
bail!(
165+
"The sysroot can't be built for the {:?} channel. \
167166
Switch to nightly.",
168-
meta.channel
169-
).ok();
170-
return cargo::run(&args, verbose);
167+
meta.channel);
171168
}
172169
};
173170

0 commit comments

Comments
 (0)