Skip to content

Commit

Permalink
Auto merge of rust-lang#135023 - jieyouxu:boop, r=onur-ozkan
Browse files Browse the repository at this point in the history
bootstrap: flip `compile::Rustc` vs `compile::Assemble`

The `PathSet` prefix matching unfortunately also has implications for `./x build compiler --stage 0`, because the path filter `"compiler"` gets consumed by `compile::Rustc` step first after `PathSet` prefix matching, whereas before `PathSet` prefix matching, `compile::Rustc` would not have consumed `"compiler"`.

This merely papers over rust-lang#134970 to unblock contributors from using `./x build compiler --stage 0`.

The `PathSet` prefix matching behavior is tracked in rust-lang#135022.

Closes rust-lang#134970.
  • Loading branch information
bors committed Jan 2, 2025
2 parents bf6f8a4 + 552c1f5 commit 6ca6659
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/bootstrap/src/core/builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,12 @@ impl<'a> Builder<'a> {
match kind {
Kind::Build => describe!(
compile::Std,
compile::Rustc,
// FIXME(#135022): `compile::Assemble` **must** come before `compile::Rustc` after
// `PathSet` also permits prefix-matching, because `compile::Rustc` can consume the
// `"compiler"` path filter first, causing `compile::Assemble` to no longer run when
// the user writes `./x build compiler --stage 0`.
compile::Assemble,
compile::Rustc,
compile::CodegenBackend,
compile::StartupObjects,
tool::BuildManifest,
Expand Down

0 comments on commit 6ca6659

Please sign in to comment.