diff options
| author | John Hodge <tpg@mutabah.net> | 2018-10-03 20:50:30 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2018-10-03 20:50:30 +0800 |
| commit | e42b7877ac1f7c173d42600b220b1f50a143b9b4 (patch) | |
| tree | eeb7f627f831de64446c18bf108c5a1297f5ee13 /Makefile | |
| parent | 9fe41ffb9bde218ad97c5430d6cc92051634357d (diff) | |
| download | mrust-e42b7877ac1f7c173d42600b220b1f50a143b9b4.tar.gz | |
Fiddling for rustc 1.29 update
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -17,8 +17,6 @@ EXESUF ?= CXX ?= g++ V ?= @ -TARGET_CC ?= clang - TAIL_COUNT ?= 10 # - Disable implicit rules @@ -177,13 +175,13 @@ rustc-nightly-src.tar.gz: $(RUSTC_SRC_DES) curl -sS https://static.rust-lang.org/dist/$${DL_RUST_DATE}/rustc-nightly-src.tar.gz -o rustc-nightly-src.tar.gz # TODO: Handle non-nightly download -$(RUSTC_SRC_DL): rust-nightly-date rustc-nightly-src.tar.gz rust_src.patch +$(RUSTC_SRC_DL): rust-nightly-date rustc-nightly-src.tar.gz rustc-nightly-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-src; \ tar -xf rustc-nightly-src.tar.gz; \ - cd $(RUSTSRC) && patch -p0 < ../rust_src.patch; \ + cd $(RUSTSRC) && patch -p0 < ../rustc-nightly-src.patch; \ fi cat rust-nightly-date > $(RUSTC_SRC_DL) else @@ -192,9 +190,9 @@ $(RUSTC_SRC_TARBALL): $(RUSTC_SRC_DES) @echo [CURL] $@ @rm -f $@ @curl -sS https://static.rust-lang.org/dist/$@ -o $@ -$(RUSTC_SRC_DL): $(RUSTC_SRC_TARBALL) rust_src.patch +$(RUSTC_SRC_DL): $(RUSTC_SRC_TARBALL) rustc-$(shell cat $(RUSTC_SRC_DES))-src.patch tar -xf $(RUSTC_SRC_TARBALL) - cd $(RUSTCSRC) && patch -p0 < ../rust_src.patch; + cd $(RUSTCSRC) && patch -p0 < ../rustc-$(shell cat $(RUSTC_SRC_DES))-src.patch; cat $(RUSTC_SRC_DES) > $(RUSTC_SRC_DL) endif |