diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2020-11-26 22:50:38 +0100 |
|---|---|---|
| committer | Pietro Albini <pietro@pietroalbini.org> | 2020-12-23 19:35:22 +0100 |
| commit | fd4515cb3f8a8e21d3640ffa8f2b3040a381b87c (patch) | |
| tree | 27c59b7ef95b434222239aad8b87a6baeccaa669 /src/bootstrap/tarball.rs | |
| parent | 0a2e1c5a2c85ff27f2677aa7db1c2deacf34242d (diff) | |
| download | rust-fd4515cb3f8a8e21d3640ffa8f2b3040a381b87c.tar.gz rust-fd4515cb3f8a8e21d3640ffa8f2b3040a381b87c.zip | |
bootstrap: refactor showing the "dist" info
Diffstat (limited to 'src/bootstrap/tarball.rs')
| -rw-r--r-- | src/bootstrap/tarball.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bootstrap/tarball.rs b/src/bootstrap/tarball.rs index 294b69c85f4..f99b6f30192 100644 --- a/src/bootstrap/tarball.rs +++ b/src/bootstrap/tarball.rs @@ -114,13 +114,17 @@ impl<'a> Tarball<'a> { self.builder.install(&self.builder.src.join(file), &self.overlay_dir, 0o644); } + let mut cmd = self.builder.tool_cmd(crate::tool::Tool::RustInstaller); + + self.builder.info(&format!("Dist {} ({})", self.component, self.target)); + let _time = crate::util::timeit(self.builder); + let mut component_name = self.component.clone(); if self.is_preview { component_name.push_str("-preview"); } let distdir = crate::dist::distdir(self.builder); - let mut cmd = self.builder.tool_cmd(crate::tool::Tool::RustInstaller); cmd.arg("generate") .arg(format!("--product-name={}", self.product_name)) .arg("--rel-manifest-dir=rustlib") @@ -137,7 +141,6 @@ impl<'a> Tarball<'a> { .arg("--legacy-manifest-dirs=rustlib,cargo") .arg(format!("--component-name={}", component_name)); self.builder.run(&mut cmd); - t!(std::fs::remove_dir_all(&self.temp_dir)); distdir.join(format!("{}-{}.tar.gz", self.pkgname, self.target)) |
