itsscb/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-03-19 12:09:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #145221 - Kobzol:cargo-dist-fix-2, r=jieyouxu

Browse Source 
Fix Cargo cross-compilation (take two)

In https://github.com/rust-lang/rust/pull/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 https://github.com/rust-lang/rust/issues/145059 for good.
This commit is contained in:
Guillaume Gomez
2025-08-11 16:19:05 +02:00
committed by GitHub
parent 77d7a2c1eb 23946b7f90
commit eee9e60afb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/src/core/build_steps/tool.rs
View File

@@ -857,7 +857,9 @@ impl Step for Cargo {
fn run(self, builder: &Builder<'_>) -> ToolBuildResult {
builder.build.require_submodule("src/tools/cargo", None);
builder.std(self.build_compiler, builder.host_target);
builder.std(self.build_compiler, self.target);
builder.ensure(ToolBuild {
build_compiler: self.build_compiler,
target: self.target,