summaryrefslogtreecommitdiffstats
path: root/ci/env-osx.sh
diff options
context:
space:
mode:
authorChris Johnson <chrisjohnsonmail@gmail.com>2019-08-27 23:00:04 (GMT)
committerGitHub <noreply@github.com>2019-08-27 23:00:04 (GMT)
commit85f059f03d56ce82cf8f68cf7505b695a0c730c2 (patch)
treee715b911578e831d7a3fdf46bbf2bdbece4fafc3 /ci/env-osx.sh
parent130e5aa86a7a71501cf8fa7cd6f507928f01bd79 (diff)
parentfdd6a1dc8c74bf37211c14a1b2e4b64755bb3380 (diff)
downloadgoogletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.zip
googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.gz
googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.bz2
Merge pull request #3 from google/master
Update master
Diffstat (limited to 'ci/env-osx.sh')
-rwxr-xr-xci/env-osx.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/ci/env-osx.sh b/ci/env-osx.sh
index 03c2d15..9c421e1 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