nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make distcheck work again.

Browse Source
This commit is contained in:
Mark Simulacrum 2017-07-22 10:48:29 -06:00
parent 8f2e576cb3
commit 1c118231ad
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/check.rs
View File

@ -1220,6 +1220,10 @@ impl Step for Distcheck {
let _ = fs::remove_dir_all(&dir);
t!(fs::create_dir_all(&dir));
// Guarantee that these are built before we begin running.
builder.ensure(dist::PlainSourceTarball);
builder.ensure(dist::Src);
let mut cmd = Command::new("tar");
cmd.arg("-xzf")
.arg(builder.ensure(dist::PlainSourceTarball))

3
src/bootstrap/dist.rs
View File

@ -875,9 +875,10 @@ impl Step for PlainSourceTarball {
let mut tarball = distdir(build).join(&format!("{}.tar.gz", plain_name));
tarball.set_extension(""); // strip .gz
tarball.set_extension(""); // strip .tar
if let Some(dir) = distdir(build).parent() {
if let Some(dir) = tarball.parent() {
t!(fs::create_dir_all(dir));
}
println!("running installer");
let mut cmd = rust_installer(builder);
cmd.arg("tarball")
.arg("--input").arg(&plain_name)