diff options
| author | bors <bors@rust-lang.org> | 2022-05-14 20:43:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-14 20:43:45 +0000 |
| commit | 70b3681bf621bc0de91ffab711b2350068b4c466 (patch) | |
| tree | 68845b93298ef18f5d59293cce4e325d06949dd1 | |
| parent | b36be12d979de84a063f617295674a40d6ddf16d (diff) | |
| parent | 9a4285c2c647c017a528cbb3ec5cc18558034954 (diff) | |
| download | rust-70b3681bf621bc0de91ffab711b2350068b4c466.tar.gz rust-70b3681bf621bc0de91ffab711b2350068b4c466.zip | |
Auto merge of #97044 - Urgau:check-cfg-fix-rustc-perf, r=Mark-Simulacrum
Fix rustc-perf benchmarks See https://github.com/rust-lang/rust/pull/96984#issuecomment-1126678773 and https://github.com/rust-lang/rust/pull/96984#issuecomment-1126719585 cc `@ehuss` `@lqd`
| -rw-r--r-- | src/bootstrap/builder.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 7d838c0a61d..894d74fb269 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1154,9 +1154,13 @@ impl<'a> Builder<'a> { // 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"); - } + // + // FIXME: Re-enable this after the beta bump as apperently rustc-perf doesn't use the + // beta cargo. See https://github.com/rust-lang/rust/pull/96984#issuecomment-1126678773 + // #[cfg(not(bootstrap))] + // if mode != Mode::Std { + // cargo.arg("-Zcheck-cfg-features"); // -Zcheck-cfg=features after bump + // } // Enable cfg checking of well known names/values rustflags |