Enforce in bootstrap that dist and install must have stage at least 1 #145472

Kobzol · 2025-08-15T19:16:46Z

This is a continuation of my efforts to fix staging in bootstrap after the stage0 redesign. This PR gets rid of all compiler_for usages in the dist steps 🎉 The only remaining usages are in the test steps, which are my next goal, and which will be the final boss.. both because they are quite tricky, and because most of the the rest of the steps have been already fixed.

The changes are relatively straightforward, x dist defaults to stage 2, so in that case we want to use a stage 1 build compiler for everything (except stdlib, but we usually use it even there because of uplifting).

What I didn't fix yet are the docs steps, because they are very implicit right now, and fixing them deserves its own PR.

The first commit reverts the tests that I accidentally removed in #145340 🤦‍♂️ I did it in this PR to avoid further git conflicts..

Best reviewed commit-by-commit.

r? @jieyouxu

try-job: dist-i686-linux
try-job: dist-armhf-linux
try-job: dist-x86_64-linux
try-job: dist-x86_64-msvc
try-job: dist-apple-various
try-job: dist-x86_64-apple

rustbot · 2025-08-15T19:16:54Z

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

…ument

rustbot · 2025-08-20T07:00:54Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Kobzol · 2025-08-20T07:03:21Z

@bors try

Enforce in bootstrap that dist and install must have stage at least 1 try-job: dist-i686-linux try-job: dist-armhf-linux try-job: dist-x86_64-linux try-job: dist-x86_64-msvc try-job: dist-apple-various try-job: dist-x86_64-apple

rust-bors · 2025-08-20T10:07:18Z

☀️ Try build successful (CI)
Build commit: f9464d8 (f9464d83262ce8f495c129d9e1059a8d108f3df9, parent: f605b57042ffeb320d7ae44490113a827139b766)

jieyouxu

Thanks, the other changes I'm on board with. The only bit I'm not sure is the rust-std build optimization, IMO it's not worth the hack to introduce a special case. WDYT?

jieyouxu · 2025-08-20T12:01:44Z

src/bootstrap/src/core/build_steps/dist.rs

        let sysroot = self.sysroot;
        let dst = sysroot.join("lib/rustlib/etc");
        t!(fs::create_dir_all(&dst));
        let cp_debugger_script = |file: &str| {
            builder.install(&builder.src.join("src/etc/").join(file), &dst, FileType::Regular);
        };
-        if host.contains("windows-msvc") {
+        if target.contains("windows-msvc") {


Remark: I really hope in the future we have some way to share an in-tree structured target spec with rustc... Target tuple string matching feels bad every time I see it 😔

jieyouxu · 2025-08-20T12:09:07Z

src/bootstrap/src/core/build_steps/dist.rs

+                "Note: stage {top_stage} library for `{}` would be uplifted from stage 1, so stage was downgraded from {top_stage} to 1 to avoid needless compiler build(s)",
+                run.target


Suggestion: maybe say

so build compiler stage was downgraded from {top_stage} to 1 to avoid needless compiler build(s)

?

jieyouxu · 2025-08-20T12:19:30Z

src/bootstrap/src/core/build_steps/dist.rs

+        // This is a build time optimization for running just `x dist rust-std` (without
+        // `x dist rustc`).
+        // If we know that we will be uplifting a stage2+ library from stage 1 anyway,
+        // there is no point in building a stage2 rustc, which will then not do anything (because
+        // the stdlib will be uplifted).


Discussion:

Who's actually using ./x dist rust-std specifically? Usually, we would be distributing a toolchain together, right? Or at least both compiler and std?

I feel uneasy about doing this build optimization, it feels rather "special" (hacky) especially when this is the dist flow. Could we get away with just doing the straightforward ™️ build? I feel like we should just do the "useless" stage 2 rustc build, and then use the same stage 2 std uplifting logic, instead of doing this special casing.

There are some CI jobs that do ./x dist --host='' --target i686-unknown-linux-gnu,aarch64-unknown-linux-gnu. But I confirmed it produced the same steps with/without this "optimization".

I agree, let's get rid of it.

src/bootstrap/src/core/build_steps/dist.rs

jieyouxu · 2025-08-20T13:04:14Z

@rustbot author

Kobzol · 2025-08-20T13:20:07Z

Agreed, removed the special case, and fixed one doc bug that I found when testing the x dist cross-compilation scenarios (the docs dist steps just invoke all default doc steps, which I'm planning to change, so it exposed this issue. Not sure why we didn't hit it on CI...).

Kobzol · 2025-08-20T13:35:17Z

@rustbot ready

jieyouxu

Thanks!

jieyouxu · 2025-08-20T14:18:57Z

src/bootstrap/src/core/build_steps/doc.rs

@@ -994,7 +994,7 @@ macro_rules! tool_doc {
                    (compilers.build_compiler(), Mode::ToolRustc)
                } else {
                    // bootstrap/host tools have to be documented with the stage 0 compiler
-                    (prepare_doc_compiler(run.builder, target, 1), Mode::ToolBootstrap)


Remark: hecc...

jieyouxu · 2025-08-20T14:19:35Z

@bors r+ rollup=never

bors · 2025-08-20T14:19:38Z

📌 Commit 7da375e has been approved by jieyouxu

It is now in the queue for this repository.

rustbot assigned jieyouxu Aug 15, 2025

This comment has been minimized.

Sign in to view

This comment was marked as outdated.

Sign in to view

Kobzol added 21 commits August 20, 2025 08:55

Re-add missing clippy tests

7d58935

Forbid running dist steps on stage 0

b8d33dd

Rename default_doc to run_default_doc_steps and remove unused arg…

5c73ee9

…ument

Document the rustc-docs step

5c7f4d4

Small refactor of Mingw step

d3ee1c2

Refactor and document the Rustc dist step

3487aed

Refactor and document the DebuggerScripts dist step

5ccafaa

Refactor Std dist step

92d076c

Refactor RustcDev dist step

99b044e

Refactor Analysis dist step

e1c63cd

Remove compiler_for from dist::Cargo

e41a58b

Remove compiler_for from dist::RustAnalyzer

f22b12f

Add snapshot test for x install

d5e042b

Remove compiler_for from dist::Clippy

9b1e33b

Remove compiler_for from dist::Miri

16bc071

Remove compiler_for from dist::CraneliftCodegenBackend

3652493

Remove compiler_for from dist::Rustfmt

6c1ca03

Remove compiler_for from dist::Extended

529d6d2

Cleanup dist::Bootstrap and add a simple test for it

af237c2

Cleanup the last few dist steps

4831c74

Forbid running install steps on stage 0

fd4c735

Kobzol added 3 commits August 20, 2025 08:58

Fix staging in x install

b7991a2

Add change tracker entry

6e3c9ab

Fix doc link

ad8384e

Kobzol force-pushed the bootstrap-dist branch from 7c6b798 to ad8384e Compare August 20, 2025 07:00

This comment has been minimized.

Sign in to view

jieyouxu approved these changes Aug 20, 2025

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 20, 2025

Kobzol added 2 commits August 20, 2025 15:16

Don't try to cross-document bootstrap tools

484d9b6

Remove the x dist rust-std built optimization special-case

7da375e

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 20, 2025

jieyouxu approved these changes Aug 20, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 20, 2025

		"Note: stage {top_stage} library for `{}` would be uplifted from stage 1, so stage was downgraded from {top_stage} to 1 to avoid needless compiler build(s)",
		run.target

Enforce in bootstrap that dist and install must have stage at least 1 #145472

Are you sure you want to change the base?

Enforce in bootstrap that dist and install must have stage at least 1 #145472

Uh oh!

Conversation

Kobzol commented Aug 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Aug 15, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment was marked as outdated.

rustbot commented Aug 20, 2025

Uh oh!

Kobzol commented Aug 20, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Aug 20, 2025

Uh oh!

jieyouxu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Aug 20, 2025

Uh oh!

Kobzol commented Aug 20, 2025

Uh oh!

Kobzol commented Aug 20, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

jieyouxu Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Aug 20, 2025

Uh oh!

bors commented Aug 20, 2025

Uh oh!

Uh oh!

Kobzol commented Aug 15, 2025 •

edited

Loading

jieyouxu left a comment •

edited

Loading