Fix uplifting in Assemble step
#145557
Open
Fix uplifting in Assemble step
#145557
+78
−34
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
Ok I realize another error now (which is already fixed in this PR). Before #145310, bootstrap used to say "uplifting stage1 rustc to stage3", but that's clearly bogus, it was actually uplifting the stage2 compiler. But I trusted the message and implemented uplifting of stage 1 in #145310, which is wrong (because of the ABI difference). |
This comment has been minimized.
This comment has been minimized.
|
my condolences on the extra space |
jieyouxu
approved these changes
Aug 18, 2025
| @@ -1441,31 +1462,51 @@ fn rustc_llvm_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelect | |||
| } | |||
| } | |||
|
|
|||
| /// `RustcLink` copies all of the rlibs from the rustc build into the previous stage's sysroot. | |||
| /// `RustcLink` copies compiler rlibs from a rustc build into a compiler sysroot. | |||
| /// It works with (potentially up to) three compilers: | |||
|
@rustbot author |
rustbot
added
S-waiting-on-author
|
@bors r=jieyouxu |
bors
added
S-waiting-on-bors
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #145310, I removed this line, which adjusted the stage of the build compiler if an uplift has happened. This broke stage3+ uplifted rustc builds (#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_compilerfrom theRustcstep, and then use that in theAssemblestep.The changes to
RustcLinkwere needed to fixui-fulldeps, which apparently build a stage3 rustc, because I haven't fixed the test steps yet 😅Hopefully we might be able to remove
RustcLinkif the approach from #144252 will work.Should fix #145534.
r? @jieyouxu