diff options
| author | John Hodge <tpg@mutabah.net> | 2017-02-12 14:06:44 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2017-02-12 14:06:44 +0800 |
| commit | 82989b54c57fb4a4a319fe1bc863c371a36a0b28 (patch) | |
| tree | 730d9eab77dc9609b292fa368247c1fc55b530f2 | |
| parent | 090f00656f30b53f47ed01dfbd01debdc4b3c6f7 (diff) | |
| download | mrust-82989b54c57fb4a4a319fe1bc863c371a36a0b28.tar.gz | |
Travis CI - Download rustc src
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index f28cd089..c9fd9118 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ addons: install: # Build mrustc + - make RUSTCSRC - CC=gcc-6 CXX=g++-6 make - - make rustc-nightly/ # Tests! (check that they parse, and keep going) script: @@ -157,7 +157,7 @@ output/librustc_llvm.hir: $(LLVM_LINKAGE_FILE) # librustc_llvm build script # RUSTC_LLVM_LINKAGE: $(LLVM_LINKAGE_FILE) -output/librustc_llvm_build: rustc-nightly/src/librustc_llvm/build.rs output/libstd.hir output/libgcc.hir output/libbuild_helper.hir +output/librustc_llvm_build: rustc-nightly/src/librustc_llvm/build.rs $(call fcn_extcrate, std gcc build_helper alloc_system panic_abort) @echo "--- [MRUSTC] $@" $(BIN) $< -o $@ $(PIPECMD) output/libgcc.hir: crates.io/gcc-0.3.28/src/lib.rs $(BIN) output/libstd.hir @@ -191,7 +191,7 @@ output/cargo_libflate/libminiz.a: output/libflate_build Makefile $Vcat $<-output.txt | grep '^cargo:' > $<-output_cargo.txt $Vcat $<-output_cargo.txt | grep 'cargo:rustc-link-search=native=' | awk -F = '{ print "-L " $$3 }' > output/rustc_link_opts-libflate.txt -output/libflate_build: rustc-nightly/src/libflate/build.rs output/libstd.hir output/libgcc.hir +output/libflate_build: rustc-nightly/src/libflate/build.rs $(call fcn_extcrate, std gcc alloc_system panic_abort) @echo "--- [MRUSTC] $@" $(BIN) $< -o $@ $(PIPECMD) @@ -264,6 +264,9 @@ output/rustc: $(RUSTCSRC)src/rustc/rustc.rs output/librustc_driver.hir output/ru # # HACK: Work around gdb returning success even if the program crashed @test -e $@ +.PHONY: RUSTCSRC +RUSTCSRC: $(RUSTCSRC) + $(RUSTCSRC): rust-nightly-date @export DL_RUST_DATE=$$(cat rust-nightly-date); \ export DISK_RUST_DATE=$$([ -f $(RUSTC_SRC_DL) ] && cat $(RUSTC_SRC_DL)); \ |