about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-09-19 18:31:43 +0200
committerGitHub <noreply@github.com>2019-09-19 18:31:43 +0200
commitff7a9cf27686476faf8f94bf3269186fafc2d9f0 (patch)
tree872338aba785523b45f479536cd6a05776a6c61c
parentea58ed942198ba1ed01de7be68fb255a46945e97 (diff)
parent2fff78038cf3eb38f2bd3fecbab123bccb59c1a8 (diff)
downloadrust-ff7a9cf27686476faf8f94bf3269186fafc2d9f0.tar.gz
rust-ff7a9cf27686476faf8f94bf3269186fafc2d9f0.zip
Rollup merge of #64611 - alexcrichton:no-libstd-twice, r=Mark-Simulacrum
rustbuild: Don't package libstd twice

Looks like the packaging step for the standard library was happening
twice on CI, but it only needs to happen once! The `Analysis` packaging
step accidentally packaged `Std` instead of relying on compiling `Std`,
which meant that we ended up packaging it twice erroneously.
-rw-r--r--src/bootstrap/dist.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 076bcd878df..e27a6bf7da0 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -762,7 +762,7 @@ impl Step for Analysis {
             return distdir(builder).join(format!("{}-{}.tar.gz", name, target));
         }
 
-        builder.ensure(Std { compiler, target });
+        builder.ensure(compile::Std { compiler, target });
 
         let image = tmpdir(builder).join(format!("{}-{}-image", name, target));