Skip to content

Commit 552c1f5

Browse files
committed
bootstrap: temporarily flip compile::Rustc vs compile::Assemble
The PathSet prefix matching unfortunately also has implications for `./x build compiler`, because the path filter `"compiler"` gets consumed by `compile::Rustc` step first after PathSet prefix matching, whereas before PathSet prefix matching, the later-registered `compile::Assemble` step would've consumed the `"compiler"` path filter. This merely papers over the issue with PathSet prefix handling to unblock contributors for using `./x build compiler`.
1 parent c528b8c commit 552c1f5

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)