Skip to content

Commit

Permalink
Auto merge of #122205 - onur-ozkan:incorrect-sysroot-for-target, r=al…
Browse files Browse the repository at this point in the history
…bertlarsan68

ensure std is prepared for cross-targets

Previously, doing `x test compiler/*` would result in build failures due to missing std. This PR fixes that.
  • Loading branch information
bors committed Mar 27, 2024
2 parents c9f8f34 + 5aece7f commit 9d70954
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/bootstrap/src/core/build_steps/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2605,8 +2605,12 @@ impl Step for Crate {
let mode = self.mode;

// See [field@compile::Std::force_recompile].
builder.ensure(compile::Std::force_recompile(compiler, target));
builder.ensure(RemoteCopyLibs { compiler, target });
builder.ensure(compile::Std::force_recompile(compiler, compiler.host));

if builder.config.build != target {
builder.ensure(compile::Std::force_recompile(compiler, target));
builder.ensure(RemoteCopyLibs { compiler, target });
}

// If we're not doing a full bootstrap but we're testing a stage2
// version of libstd, then what we're actually testing is the libstd
Expand Down

0 comments on commit 9d70954

Please sign in to comment.