Skip to content

Commit 6cb8bbc

Browse files
committed
rustbuild: Fix dist of save-analysis info
We don't need an extra bare tarball, the save-analysis info is already produced with a version/target in the filename.
1 parent 5f07d3d commit 6cb8bbc

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

Diff for: src/bootstrap/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! `package_vers`, and otherwise indicating to the compiler what it should
1616
//! print out as part of its version information.
1717
18-
use std::fs::{self, File};
18+
use std::fs::File;
1919
use std::io::prelude::*;
2020
use std::process::Command;
2121

Diff for: src/bootstrap/dist.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//! out to `rust-installer` still. This may one day be replaced with bits and
1919
//! pieces of `rustup.rs`!
2020
21-
use std::fs::File;
21+
use std::fs::{self, File};
2222
use std::io::Write;
2323
use std::path::{PathBuf, Path};
2424
use std::process::Command;
@@ -324,13 +324,6 @@ pub fn analysis(build: &Build, compiler: &Compiler, target: &str) {
324324
.arg("--legacy-manifest-dirs=rustlib,cargo");
325325
build.run(&mut cmd);
326326
t!(fs::remove_dir_all(&image));
327-
328-
// Create plain source tarball
329-
let mut cmd = Command::new("tar");
330-
cmd.arg("-czf").arg(sanitize_sh(&distdir(build).join(&format!("{}.tar.gz", name))))
331-
.arg("analysis")
332-
.current_dir(&src);
333-
build.run(&mut cmd);
334327
}
335328

336329
/// Creates the `rust-src` installer component and the plain source tarball

Diff for: src/bootstrap/step.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ pub fn build_rules(build: &Build) -> Rules {
499499
.default(true)
500500
.dep(|s| s.name("default:doc"))
501501
.run(move |s| dist::docs(build, s.stage, s.target));
502-
rules.dist("dist-analysis", "src/libstd")
502+
rules.dist("dist-analysis", "analysis")
503503
.dep(|s| s.name("dist-std"))
504504
.default(true)
505505
.run(move |s| dist::analysis(build, &s.compiler(), s.target));

0 commit comments

Comments
 (0)