diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-08-19 14:18:26 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-19 14:18:26 +1000 |
| commit | cf2f50e332fc57ada7c667080df3df414ef6bd5f (patch) | |
| tree | 35c47cddab1d43bc8282c4250bd86288dad15652 /library/std/src/lib.rs | |
| parent | 8748d8e7d5b63932e3062361f736ff436c86be1f (diff) | |
| parent | 4c212513cf084ad2923cbf86b38c30d4a11fb48d (diff) | |
| download | rust-cf2f50e332fc57ada7c667080df3df414ef6bd5f.tar.gz rust-cf2f50e332fc57ada7c667080df3df414ef6bd5f.zip | |
Rollup merge of #145557 - Kobzol:rustc-link-fix, r=jieyouxu
Fix uplifting in `Assemble` step In https://github.com/rust-lang/rust/pull/145310, I removed [this line](https://github.com/rust-lang/rust/pull/145310/files#diff-5a1e05f2688d271039171a547d407d0c8a96715ee64d35562fc76b4c9a874303L2109), which adjusted the stage of the build compiler if an uplift has happened. This broke stage3+ uplifted rustc builds (https://github.com/rust-lang/rust/issues/145534). I could swear I tested this in the PR, but somehow I missed it. Instead of keeping the original returned stage, I made it more explicit by returning the actually used `build_compiler` from the `Rustc` step, and then use that in the `Assemble` step. The changes to `RustcLink` were needed to fix `ui-fulldeps`, which apparently build a stage3 rustc, because I haven't fixed the test steps yet :sweat_smile: Hopefully we might be able to remove `RustcLink` if the approach from https://github.com/rust-lang/rust/pull/144252 will work. Should fix https://github.com/rust-lang/rust/issues/145534. r? ``@jieyouxu``
Diffstat (limited to 'library/std/src/lib.rs')
0 files changed, 0 insertions, 0 deletions