From 5aece7fad06baaa745784d118db862b3e3ccf7f8 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Fri, 8 Mar 2024 22:20:51 +0300
Subject: [PATCH] ensure std for cross-targets
Previously, doing `x test compiler/*` would fail the build due to missing std.
This change ensures that it is prepared.
Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
src/bootstrap/src/core/build_steps/test.rs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 4a4497e57db14..14a6ee22de6c3 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -2564,8 +2564,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