Re-enable OSX builds on Travis CI

This reverts commit fc38f9b.
rust-lang · Jan 31, 2017 · 5f34248 · 5f34248
1 parent bdd034b
commit 5f34248
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ addons:
 
 os:
   - linux
+  - osx
 
 rust:
   - stable

diff --git a/ci/before_install.sh b/ci/before_install.sh
@@ -1,6 +1,11 @@
 set -e
 pushd ~
 
+# Workaround for Travis CI macOS bug (https://github.com/travis-ci/travis-ci/issues/6307)
+if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
+    rvm get head || true
+fi
+
 function llvm_version_triple() {
     if [ "$1" == "3.8" ]; then
         echo "3.8.0"
@@ -18,9 +23,17 @@ function llvm_download() {
     tar -xf ${LLVM}.tar.xz -C llvm --strip-components=1
 
     export LLVM_CONFIG_PATH=`pwd`/llvm/bin/llvm-config
+    if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
+        cp llvm/lib/libclang.dylib /usr/local/lib/libclang.dylib
+    fi
 }
 
-llvm_download linux-gnu-ubuntu-14.04
+
+if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
+    llvm_download linux-gnu-ubuntu-14.04
+else
+    llvm_download apple-darwin
+fi
 
 popd
 set +e
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ addons: @@
     os:
       - linux
+      - osx
     rust:
       - stable
@@ Expand Down @@