`x.py build` no longer places `rustc` and `rustdoc` binaries into `stage2/` with config `profile = "tools"`

[fmease]

./x.py b with profile = "tools" in config.toml no longer places rustc & rustdoc into build/$TARGET/stage2/bin/ but just into build/$TARGET/ci-rustc-sysroot/bin/.
Tested on Linux.

Zulip discussion.

@rustbot label T-infra A-bootstrap A-contributor-roadblock

[jyn514]

I'm not convinced the binaries in ci-rustc-sysroot are actually the newly compiled binaries; I think they may just never be copied from stage1-tools-bin into a sysroot.

[fmease]

I'm not convinced the binaries in ci-rustc-sysroot are actually the newly compiled binaries

I am not familiar enough with the bootstrap process to be able to confirm or dispute this.
As far as I'm concerned, I've relinked my rustup toolchain stage2 to ci-rustc-sysroot and everything appears to work flawlessly.

[jyn514]

@fmease can you post the output of rustc +stage2 --version and rustdoc +stage2 --version?

[fmease]

rustc 1.66.0-nightly (e94827e5b 2022-10-18)
rustdoc 1.66.0-nightly (e94827e5b 2022-10-18)

[jyn514]

yeah that looks like it's not actually reflecting your changes, just using the latest nightly unmodified

If it were working properly it would say -dev

[fmease]

Hmm, that can't be. I am currently working on fixing #24183 and modifications to the rustdoc source code are indeed properly reflected in the compiled binaries. Maybe the version string is just wrong but my local changes are picked up.

[fmease]

Actually, I have a counterquestion. Can you by chance reproduce this? Or is it just me and @aDotInTheVoid? I'm just wondering why more people haven't stumbled upon this issue.

[onur-ozkan]

@rustbot claim

[jyn514]

cc #102025