summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgnzlbg <gonzalobg88@gmail.com>2019-02-19 12:12:49 +0100
committergnzlbg <gonzalobg88@gmail.com>2019-02-20 11:21:38 +0100
commite3914cf31a4f27fa02845bd59328afff1f7eb5b5 (patch)
treea67725255317b4c87b0e10c0badf468ffc9eef52
parent9bdc5122daaa782e3d7f5f3cd27371cb285cd91d (diff)
downloadrust-libc-e3914cf31a4f27fa02845bd59328afff1f7eb5b5.tar.gz
Make the build script fail faster
-rw-r--r--.travis.yml4
-rw-r--r--ci/build.sh5
2 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 5a5bbebfa4..115a516ad0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,9 @@ matrix:
script: sh ci/build.sh
stage: tools-and-build-and-tier1
rust: nightly
- install: true
+ install:
+ - rustup component add rust-src
+ - cargo install xargo
- name: "Build Stable Rust"
script: sh ci/build.sh
stage: tools-and-build-and-tier1
diff --git a/ci/build.sh b/ci/build.sh
index a1a6b03dbd..0666bf1416 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -30,7 +30,7 @@ test_target() {
;;
esac
- rustup target add "${TARGET}" --toolchain "${RUST}" || true
+ rustup target add "${TARGET}" --toolchain "${RUST}"
# Test that libc builds without any default features (no libstd)
"$CARGO" "+${RUST}" build -vv $opt --no-default-features --target "${TARGET}"
@@ -198,9 +198,6 @@ x86_64-unknown-openbsd
"
if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then
- rustup component add rust-src || true
- cargo install xargo || true
-
for TARGET in $RUST_LINUX_NO_CORE_TARGETS; do
RUST_LIBC_NO_CORE_BUILD=1 test_target xargo "$TARGET" 1
done