From 1c118231adaa941899773420b21bc6b55ca3014f Mon Sep 17 00:00:00 2001
From: Mark Simulacrum <mark.simulacrum@gmail.com>
Date: Sat, 22 Jul 2017 10:48:29 -0600
Subject: [PATCH] Make distcheck work again.

---
 src/bootstrap/check.rs | 4 ++++
 src/bootstrap/dist.rs  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index fe24a666de2bb..ee58926175291 100644
--- 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
index 9719b2472c63c..cdaab9d9c8d9e 100644
--- 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)