diff options
| -rw-r--r-- | src/bootstrap/channel.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/dist.rs | 9 | ||||
| -rw-r--r-- | src/bootstrap/step.rs | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index 5b14b9bda6f..c38bb33aa02 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -15,7 +15,7 @@ //! `package_vers`, and otherwise indicating to the compiler what it should //! print out as part of its version information. -use std::fs::{self, File}; +use std::fs::File; use std::io::prelude::*; use std::process::Command; diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 3abd3381090..a015f485205 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -18,7 +18,7 @@ //! out to `rust-installer` still. This may one day be replaced with bits and //! pieces of `rustup.rs`! -use std::fs::File; +use std::fs::{self, File}; use std::io::Write; use std::path::{PathBuf, Path}; use std::process::Command; @@ -324,13 +324,6 @@ pub fn analysis(build: &Build, compiler: &Compiler, target: &str) { .arg("--legacy-manifest-dirs=rustlib,cargo"); build.run(&mut cmd); t!(fs::remove_dir_all(&image)); - - // Create plain source tarball - let mut cmd = Command::new("tar"); - cmd.arg("-czf").arg(sanitize_sh(&distdir(build).join(&format!("{}.tar.gz", name)))) - .arg("analysis") - .current_dir(&src); - build.run(&mut cmd); } /// Creates the `rust-src` installer component and the plain source tarball diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs index 884cc7da8ea..631e5fa1afd 100644 --- a/src/bootstrap/step.rs +++ b/src/bootstrap/step.rs @@ -499,7 +499,7 @@ pub fn build_rules(build: &Build) -> Rules { .default(true) .dep(|s| s.name("default:doc")) .run(move |s| dist::docs(build, s.stage, s.target)); - rules.dist("dist-analysis", "src/libstd") + rules.dist("dist-analysis", "analysis") .dep(|s| s.name("dist-std")) .default(true) .run(move |s| dist::analysis(build, &s.compiler(), s.target)); |