Fix Cargo cross-compilation (take two) #145221
Merged
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
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Aug 11, 2025
Rollup of 4 pull requests Successful merges: - #144966 ( Improve suggestion for "missing function argument" on multiline call) - #145111 (remove some unused private trait impls) - #145221 (Fix Cargo cross-compilation (take two)) - #145247 (Update `sysinfo` version to `0.37.0`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Aug 11, 2025
Rollup merge of #145221 - Kobzol:cargo-dist-fix-2, r=jieyouxu Fix Cargo cross-compilation (take two) In #145083, I fixed the case of manually invoking `x dist cargo`, but I realized that `x install` creates the `tool::Cargo` step through the `from_build_frompiler` constructor, which doesn't go through `get_tool_target_compiler`. So we just prepare both the host and target stdlibs directly before building Cargo. Ideally we would get rid of `from_build_compiler`, but that will require refactoring the dist and test steps, which is upcoming. Hopefully fixes #145059 for good.
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 #145083, I fixed the case of manually invoking
x dist cargo, but I realized thatx installcreates thetool::Cargostep through thefrom_build_frompilerconstructor, which doesn't go throughget_tool_target_compiler. So we just prepare both the host and target stdlibs directly before building Cargo. Ideally we would get rid offrom_build_compiler, but that will require refactoring the dist and test steps, which is upcoming.Hopefully fixes #145059 for good.