From 34618de6453c69b495ef253803e5bd2ecf322ffc Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@ucc.asn.au>
Date: Sun, 24 Sep 2017 08:30:36 +0800
Subject: Makefile - Download tarball separately

---
 Makefile | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 7f656b6f..6652810f 100644
--- a/Makefile
+++ b/Makefile
@@ -169,19 +169,18 @@ fn_getdeps = \
 .PHONY: RUSTCSRC
 RUSTCSRC: $(RUSTCSRC)
 
-$(RUSTCSRC): rust-nightly-date rust_src.patch
+rustc-nightly-src.tar.gz: rust-nightly-date
 	@export DL_RUST_DATE=$$(cat rust-nightly-date); \
 	export DISK_RUST_DATE=$$([ -f $(RUSTC_SRC_DL) ] && cat $(RUSTC_SRC_DL)); \
-	if [ "$$DL_RUST_DATE" != "$$DISK_RUST_DATE" ]; then \
-		echo "Rust version on disk is '$${DISK_RUST_DATE}'. Downloading $${DL_RUST_DATE}."; \
-		rm -f rustc-nightly-src.tar.gz; \
-		rm -rf rustc-nightly; \
-		curl -sS https://static.rust-lang.org/dist/$${DL_RUST_DATE}/rustc-nightly-src.tar.gz -o rustc-nightly-src.tar.gz; \
-		tar -xf rustc-nightly-src.tar.gz; \
-		mv rustc-nightly-src rustc-nightly; \
-		patch -p0 < rust_src.patch; \
-		echo "$$DL_RUST_DATE" > $(RUSTC_SRC_DL); \
-	fi
+	echo "Rust version on disk is '$${DISK_RUST_DATE}'. Downloading $${DL_RUST_DATE}."; \
+	rm -f rustc-nightly-src.tar.gz; \
+	curl -sS https://static.rust-lang.org/dist/$${DL_RUST_DATE}/rustc-nightly-src.tar.gz -o rustc-nightly-src.tar.gz
+
+$(RUSTCSRC): rustc-nightly-src.tar.gz rust_src.patch
+	@rm -rf rustc-nightly
+	tar -xf rustc-nightly-src.tar.gz; mv rustc-nightly-src rustc-nightly
+	patch -p0 < rust_src.patch;
+	cat rust-nightly-date > $(RUSTC_SRC_DL);
 
 
 # MRUSTC-specific tests
-- 
cgit v1.2.3