Get travis working on OSX

diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh
index 578c004cc361b780bcc8f045b7d730ea259d54d3..39750a392c253944dfd4efefb453f3ead31e046a 100755 (executable)
--- a/.travis.install.deps.sh
+++ b/.travis.install.deps.sh
@@ -1,9 +1,13 @@
 set -ex
 
-# Install a 32-bit compiler for linux
-sudo apt-get update
-sudo apt-get install gcc-multilib
-target=unknown-linux-gnu
+if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+    target=apple-darwin
+else
+    # Install a 32-bit compiler for linux
+    sudo apt-get update
+    sudo apt-get install gcc-multilib
+    target=unknown-linux-gnu
+fi
 
 # Install both 64 and 32 bit libraries. Apparently travis barfs if you try to
 # just install the right ones? This should enable cross compilation in the
@@ -19,3 +23,7 @@ cp -r rust-nightly-i686-$target/lib/rustlib/i686-$target \
  lib/rustlib/manifest.in)
 sudo ./rust-nightly-x86_64-$target/install.sh
 
+export RUSTC="rustc --target=${ARCH}-${target}"
+
+set +ex
+

diff --git a/.travis.yml b/.travis.yml
index b51759b1ae0aae59026ed739b7bd00b9778a0b09..a50fd3b3ea3f516db75e67dcf18868063e07016f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,15 @@
 language: rust
 
 install:
-  - ./.travis.install.deps.sh
+  - . ./.travis.install.deps.sh
 
 script:
   - make CC="$CC" RUSTC="$RUSTC" -j4
   - make CC="$CC" RUSTC="$RUSTC" test -j4
 
 env:
-  - ARCH=i686 CC='cc -m32' RUSTC='rustc --target=i686-unknown-linux-gnu'
-  - ARCH=x86_64 CC=cc RUSTC='rustc --target=x86_64-unknown-linux-gnu'
+  - ARCH=i686 CC='cc -m32'
+  - ARCH=x86_64 CC=cc
 
 os:
   - linux