about summary refs log tree commit diff
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2025-01-03 08:57:58 +0300
committeronur-ozkan <work@onurozkan.dev>2025-01-03 08:57:58 +0300
commitbe2f75f3b7c226c6dd025fe43c8df8d8d2477aac (patch)
tree1403d6217ece18bf304f80a8a3539153bdd578dc
parentc367c62b27b8f75b04d59d34727066c080472db8 (diff)
downloadrust-be2f75f3b7c226c6dd025fe43c8df8d8d2477aac.tar.gz
rust-be2f75f3b7c226c6dd025fe43c8df8d8d2477aac.zip
Revert "bootstrap: temporarily flip `compile::Rustc` vs `compile::Assemble`"
This reverts commit 552c1f5f45ec8b8cb5c9427754a7c3d16ca9f741.
-rw-r--r--src/bootstrap/src/core/builder/mod.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs
index e04be1ae697..3bfa9071e70 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,