summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/env-osx.sh8
-rwxr-xr-xci/install-osx.sh3
2 files changed, 9 insertions, 2 deletions
diff --git a/ci/env-osx.sh b/ci/env-osx.sh
index 03c2d15d..9c421e14 100755
--- a/ci/env-osx.sh
+++ b/ci/env-osx.sh
@@ -37,5 +37,11 @@
#
if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
+ if [ "$CXX" = "clang++" ]; then
+ # $PATH needs to be adjusted because the llvm tap doesn't install the
+ # package to /usr/local/bin, etc, like the gcc tap does.
+ # See: https://github.com/Homebrew/legacy-homebrew/issues/29733
+ clang_version=3.9
+ export PATH="/usr/local/opt/llvm@${clang_version}/bin:$PATH";
+ fi
fi
diff --git a/ci/install-osx.sh b/ci/install-osx.sh
index 6550ff51..f2baebd2 100755
--- a/ci/install-osx.sh
+++ b/ci/install-osx.sh
@@ -36,4 +36,5 @@ if [ "${TRAVIS_OS_NAME}" != "osx" ]; then
exit 0
fi
-brew install ccache
+brew update
+brew install ccache gcc@4.9 llvm@3.9