Skip to content

Enable cfg checking of cargo features for everything but std #96670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2022
Merged

Enable cfg checking of cargo features for everything but std #96670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/bootstrap/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,13 +1131,22 @@ impl<'a> Builder<'a> {
rustflags.arg("-Zunstable-options");
}

// #[cfg(not(bootstrap)]
// FIXME(Urgau): This a hack as it shouldn't be gated on stage 0 but until `rustc_llvm`
// is made to work with `--check-cfg` which is currently not easly possible until cargo
// get some support for setting `--check-cfg` within build script, it's the least invasive
// hack that still let's us have cfg checking for the vast majority of the codebase.
if stage != 0 {
// Enable cfg checking of cargo features
// FIXME: De-comment this when cargo beta get support for it
// cargo.arg("-Zcheck-cfg-features");
// Enable cfg checking of cargo features for everything but std.
//
// Note: `std`, `alloc` and `core` imports some dependencies by #[path] (like
// backtrace, core_simd, std_float, ...), those dependencies have their own features
// but cargo isn't involved in the #[path] and so cannot pass the complete list of
// features, so for that reason we don't enable checking of features for std.
if mode != Mode::Std {
cargo.arg("-Zcheck-cfg-features");
}

// Enable cfg checking of rustc well-known names
// Enable cfg checking of well known names/values
rustflags
.arg("-Zunstable-options")
// Enable checking of well known names
Expand Down