From be2f75f3b7c226c6dd025fe43c8df8d8d2477aac Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Fri, 3 Jan 2025 08:57:58 +0300 Subject: [PATCH] Revert "bootstrap: temporarily flip `compile::Rustc` vs `compile::Assemble`" This reverts commit 552c1f5f45ec8b8cb5c9427754a7c3d16ca9f741. --- src/bootstrap/src/core/builder/mod.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs index e04be1ae6974..3bfa9071e70e 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -854,12 +854,8 @@ impl<'a> Builder<'a> { match kind { Kind::Build => describe!( compile::Std, - // 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::Assemble, compile::CodegenBackend, compile::StartupObjects, tool::BuildManifest,