diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Makefile | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index de3cc42e..2888a9e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,9 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - debian-sid packages: - g++-6 - zlib1g-dev - - libssl1.0.0 env: - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" - os: linux @@ -21,11 +19,9 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - debian-sid packages: - g++-5 - zlib1g-dev - - libssl1.0.0 env: - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" @@ -8,7 +8,8 @@ # - Attempts to compile rust's libstd # # DEPENDENCIES -# - zlib +# - zlib (-dev) +# - curl (bin, for downloading libstd source) EXESUF ?= CXX ?= g++ @@ -142,7 +143,7 @@ $(RUSTCSRC): rust-nightly-date echo "Rust version on disk is '$${DISK_RUST_DATE}'. Downloading $${DL_RUST_DATE}."; \ rm -f rustc-nightly-src.tar.gz; \ rm -rf rustc-nightly; \ - wget https://static.rust-lang.org/dist/$${DL_RUST_DATE}/rustc-nightly-src.tar.gz; \ + curl -s 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; \ echo "$$DL_RUST_DATE" > $(RUSTC_SRC_DL); \ fi |