Make distcheck work again.

Mark-Simulacrum · Jul 22, 2017 · 1c11823 · 1c11823
1 parent 8f2e576
commit 1c11823
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
@@ -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))

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -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)