diff options
| author | bors <bors@rust-lang.org> | 2022-05-29 16:28:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-29 16:28:21 +0000 |
| commit | bef2b7cd1c7bcb3393f10d5752fcf9ee3026bce8 (patch) | |
| tree | 69cee0fee5ca2644af4dfdea4ae7a966ad416f0a /src/bootstrap | |
| parent | 9d1aeaeb827da7a10b7cfaccf0a1d6ebf414a7b5 (diff) | |
| parent | b454991ac4eef89480679f595cbe81e0d5e23262 (diff) | |
| download | rust-bef2b7cd1c7bcb3393f10d5752fcf9ee3026bce8.tar.gz rust-bef2b7cd1c7bcb3393f10d5752fcf9ee3026bce8.zip | |
Auto merge of #97214 - Mark-Simulacrum:stage0-bump, r=pietroalbini
Finish bumping stage0 It looks like the last time had left some remaining cfg's -- which made me think that the stage0 bump was actually successful. This brings us to a released 1.62 beta though. This now brings us to cfg-clean, with the exception of check-cfg-features in bootstrap; I'd prefer to leave that for a separate PR at this time since it's likely to be more tricky. cc https://github.com/rust-lang/rust/pull/97147#issuecomment-1132845061 r? `@pietroalbini`
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index d344c55158a..ab4b52f2555 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1647,9 +1647,7 @@ impl<'a> Builder<'a> { }, ); - // FIXME(davidtwco): #[cfg(not(bootstrap))] - #95612 needs to be in the bootstrap compiler - // for this conditional to be removed. - if !target.contains("windows") || compiler.stage >= 1 { + if !target.contains("windows") { let needs_unstable_opts = target.contains("linux") || target.contains("windows") || target.contains("bsd") |