Use rustup rather than installing iOS stdlibs manually

pcwalton · Jun 9, 2017 · bfd949e · bfd949e
1 parent baa5586
commit bfd949e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,8 @@ matrix:
       rust: stable
       env: FEATURES="exception verify_message" IOS_ARCHS=""
     - os: osx
-      osx_image: xcode7.2
-      rust: 1.9.0
+      osx_image: xcode7.3
+      rust: stable
       env: FEATURES="exception" IOS_ARCHS="i386 x86_64 armv7 armv7s aarch64"
 sudo: false
 install: ./travis_install.sh

diff --git a/travis_install.sh b/travis_install.sh
@@ -2,13 +2,6 @@
 
 set -eu
 
-rust_ios_install() {
-    ios_stdlib="rust-std-1.9.0-${1}-apple-ios"
-    curl -O "https://static.rust-lang.org/dist/${ios_stdlib}.tar.gz"
-    tar xzf "${ios_stdlib}.tar.gz"
-    "./${ios_stdlib}/install.sh" --prefix=$(rustc --print sysroot)
-}
-
 gnustep_install() {
     git clone https://github.com/gnustep/libobjc2.git
     mkdir libobjc2/build
@@ -20,7 +13,7 @@ gnustep_install() {
 }
 
 for arch in $IOS_ARCHS; do
-    rust_ios_install "$arch"
+    rustup target add "${arch}-apple-ios"
 done
 
 if [ -n "$IOS_ARCHS" ]; then