From 336a27c45c2403966fb570e61ad7c44a9cd293fe Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 29 Nov 2017 15:00:52 -0800 Subject: [PATCH 1/3] rustbuild: Fix a typo with the Cargo book The usage of `Path::new` prevented out-of-tree builds (like the bots do) from working by accident! Closes #46195 --- src/bootstrap/doc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index 9186699a3b583..3c12cfc4c7ffd 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -159,7 +159,7 @@ impl Step for CargoBook { let target = self.target; let name = self.name; - let src = PathBuf::from("src/tools/cargo/src/doc/book"); + let src = build.src.join("src/tools/cargo/src/doc/book"); let out = build.doc_out(target); t!(fs::create_dir_all(&out)); From 0ab1e065774a3a34bf1de2bcf22c498680da6c7a Mon Sep 17 00:00:00 2001 From: kennytm Date: Thu, 14 Dec 2017 01:21:33 +0800 Subject: [PATCH 2/3] Download the crosstool from GitHub instead of crosstool-ng.org Temporary workaround since crosstool-ng.org was down. Consider mirroring the release tarball as a more permanent solution. --- src/ci/docker/scripts/crosstool-ng.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ci/docker/scripts/crosstool-ng.sh b/src/ci/docker/scripts/crosstool-ng.sh index 79a5bc3bb4ac6..4cd25ffa277a4 100644 --- a/src/ci/docker/scripts/crosstool-ng.sh +++ b/src/ci/docker/scripts/crosstool-ng.sh @@ -10,11 +10,12 @@ set -ex -url="http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2" -curl -f $url | tar xjf - -cd crosstool-ng +url="https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-1.22.0.tar.gz" +curl -Lf $url | tar xzf - +cd crosstool-ng-crosstool-ng-1.22.0 +./bootstrap ./configure --prefix=/usr/local make -j$(nproc) make install cd .. -rm -rf crosstool-ng +rm -rf crosstool-ng-crosstool-ng-1.22.0 From bc3e2aea66f3bf48cd2a78f456e56ffa341905f0 Mon Sep 17 00:00:00 2001 From: kennytm Date: Wed, 13 Dec 2017 04:23:12 +0800 Subject: [PATCH 3/3] Temporarily use the old Travis image. Use it until travis-ci/travis-ci#8891 is fixed. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5ff3a1c13f0d1..c87f5e243224d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: shell sudo: required dist: trusty +group: deprecated-2017Q4 services: - docker