Run more extra targets on nightly

1 files changed, 24 insertions, 17 deletions

diff --git a/ci/run-travis.sh b/ci/run-travis.sh
index 09f2d79dab..f214babcfc 100644
--- a/ci/run-travis.sh
+++ b/ci/run-travis.sh
@@ -11,6 +11,9 @@ else
 fi
 
 export HOST=$ARCH-$OS
+if [ "$TARGET" = "" ]; then
+  TARGET=$HOST
+fi
 
 MAIN_TARGETS=https://static.rust-lang.org/dist
 EXTRA_TARGETS=https://people.mozilla.org/~acrichton/libc-test/2015-09-08
@@ -21,6 +24,27 @@ install() {
 }
 
 case "$TARGET" in
+  *-apple-ios)
+    curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
+    ;;
+
+  *)
+    # Download the rustlib folder from the relevant portion of main distribution's
+    # tarballs.
+    dir=rust-std-$TARGET
+    pkg=rust-std
+    if [ "$TRAVIS_RUST_VERSION" = "1.0.0" ]; then
+      pkg=rust
+      dir=rustc
+    fi
+    curl -s $MAIN_TARGETS/$pkg-$TRAVIS_RUST_VERSION-$TARGET.tar.gz | \
+      tar xzf - -C $HOME/rust/lib/rustlib --strip-components=4 \
+        $pkg-$TRAVIS_RUST_VERSION-$TARGET/$dir/lib/rustlib/$TARGET
+    ;;
+
+esac
+
+case "$TARGET" in
   # Pull a pre-built docker image for testing android, then run tests entirely
   #d within that image.
   arm-linux-androideabi)
@@ -30,33 +54,27 @@ case "$TARGET" in
     ;;
 
   x86_64-unknown-linux-musl)
-    curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
     install musl-tools
     export CC=musl-gcc
     ;;
 
   arm-unknown-linux-gnueabihf)
-    curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
     install gcc-4.7-arm-linux-gnueabihf qemu-user
     export CC=arm-linux-gnueabihf-gcc-4.7
     ;;
 
   aarch64-unknown-linux-gnu)
-    curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
     install gcc-aarch64-linux-gnu qemu-user
     export CC=aarch64-linux-gnu-gcc
     ;;
 
   *-apple-ios)
-    curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
     ;;
 
   mips-unknown-linux-gnu)
     # Download pre-built and custom MIPS libs and then also instsall the MIPS
     # compiler according to this post:
     # http://sathisharada.blogspot.com/2014_10_01_archive.html
-    curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
-
     echo 'deb http://ftp.de.debian.org/debian squeeze main' | \
       sudo tee -a /etc/apt/sources.list
     echo 'deb http://www.emdebian.org/debian/ squeeze main' | \
@@ -67,17 +85,6 @@ case "$TARGET" in
     ;;
 
   *)
-    # Download the rustlib folder from the relevant portion of main distribution's
-    # tarballs.
-    pkg=rust-std-$HOST
-    if [ "$TRAVIS_RUST_VERSION" = "1.0.0" ]; then
-      pkg=rustc
-    fi
-    curl -s $MAIN_TARGETS/rust-$TRAVIS_RUST_VERSION-$HOST.tar.gz | \
-      tar xzf - -C $HOME/rust/lib/rustlib --strip-components=4 \
-        rust-$TRAVIS_RUST_VERSION-$HOST/$pkg/lib/rustlib/$HOST
-    TARGET=$HOST
-
     # clang has better error messages and implements alignof more broadly
     export CC=clang