summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorJoshua Nelson <github@jyn.dev>2023-04-09 12:31:04 -0500
committerJoshua Nelson <github@jyn.dev>2023-04-10 22:18:51 -0500
commit47ff60dc09299b15102b4ebe0efd6a0446fe5a05 (patch)
tree9bd942aefc257d2f5f5162a962c38dc40f0dd382 /src/bootstrap
parentdd2b19539ea4d62a150cf13d45942e58b6b44e54 (diff)
downloadrust-47ff60dc09299b15102b4ebe0efd6a0446fe5a05.tar.gz
rust-47ff60dc09299b15102b4ebe0efd6a0446fe5a05.zip
Fix `x test ui --target foo` when download-rustc is enabled
Previously, we would never build the target std, only the host std.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/compile.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index e3581943f2c..85d1c12cc6a 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -83,11 +83,11 @@ impl Step for Std {
         let target = self.target;
         let compiler = self.compiler;
 
-        // These artifacts were already copied (in `impl Step for Sysroot`).
-        // Don't recompile them.
+        // When using `download-rustc`, we already have artifacts for the host available
+        // (they were copied in `impl Step for Sysroot`). Don't recompile them.
         // NOTE: the ABI of the beta compiler is different from the ABI of the downloaded compiler,
         // so its artifacts can't be reused.
-        if builder.download_rustc() && compiler.stage != 0 {
+        if builder.download_rustc() && compiler.stage != 0 && target == builder.build.build {
             return;
         }