Skip to content

Commit 6ca6659

Browse files
committed
Auto merge of #135023 - jieyouxu:boop, r=onur-ozkan
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 #134970 to unblock contributors from using `./x build compiler --stage 0`. The `PathSet` prefix matching behavior is tracked in #135022. Closes #134970.
2 parents bf6f8a4 + 552c1f5 commit 6ca6659

File tree

1 file changed

+5
-1
lines changed
  • src/bootstrap/src/core/builder

1 file changed

+5
-1
lines changed

src/bootstrap/src/core/builder/mod.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -825,8 +825,12 @@ impl<'a> Builder<'a> {
825825
match kind {
826826
Kind::Build => describe!(
827827
compile::Std,
828-
compile::Rustc,
828+
// FIXME(#135022): `compile::Assemble` **must** come before `compile::Rustc` after
829+
// `PathSet` also permits prefix-matching, because `compile::Rustc` can consume the
830+
// `"compiler"` path filter first, causing `compile::Assemble` to no longer run when
831+
// the user writes `./x build compiler --stage 0`.
829832
compile::Assemble,
833+
compile::Rustc,
830834
compile::CodegenBackend,
831835
compile::StartupObjects,
832836
tool::BuildManifest,

0 commit comments

Comments
 (0)