summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rw-r--r--minicargo.mk7
2 files changed, 14 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6652810f..cdc9c010 100644
--- a/Makefile
+++ b/Makefile
@@ -177,9 +177,13 @@ rustc-nightly-src.tar.gz: rust-nightly-date
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;
+ @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 \
+ rm -rf rustc-nightly; \
+ tar -xf rustc-nightly-src.tar.gz; mv rustc-nightly-src rustc-nightly; \
+ patch -p0 < rust_src.patch; \
+ fi
cat rust-nightly-date > $(RUSTC_SRC_DL);
diff --git a/minicargo.mk b/minicargo.mk
index 84fa134a..670529b8 100644
--- a/minicargo.mk
+++ b/minicargo.mk
@@ -68,3 +68,10 @@ $(RUSTCSRC)build/Makefile: $(RUSTCSRC)src/llvm/CMakeLists.txt
@mkdir -p $(RUSTCSRC)build
$Vcd $(RUSTCSRC)build && cmake $(addprefix -D , $(LLVM_CMAKE_OPTS)) ../src/llvm
+
+#
+# Developement-only targets
+#
+$(OUTDIR)libnum.hir: $(MRUSTC) $(OUTDIR)libstd.hir
+ $(MINICARGO) $(RUSTCSRC)src/vendor/num --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)
+