diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-10-19 13:30:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 13:30:13 -0700 |
| commit | c955e33497965a90c936a221610bdfb7fad3ca49 (patch) | |
| tree | 803c4727654f51b8e70071f54498903a93ecb724 /ci/env-osx.sh | |
| parent | 3149e0e88bf09841009851a478dd835fc557aaa1 (diff) | |
| parent | f410177a8b54705bb5efaa7be4ef322153349187 (diff) | |
| download | googletest-c955e33497965a90c936a221610bdfb7fad3ca49.tar.gz googletest-c955e33497965a90c936a221610bdfb7fad3ca49.tar.bz2 googletest-c955e33497965a90c936a221610bdfb7fad3ca49.zip | |
Merge branch 'master' into python3-tests
Diffstat (limited to 'ci/env-osx.sh')
| -rwxr-xr-x | ci/env-osx.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/env-osx.sh b/ci/env-osx.sh index 127a969b..03c2d15d 100755 --- a/ci/env-osx.sh +++ b/ci/env-osx.sh @@ -34,7 +34,8 @@ # # TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}. +# -if [ "${TRAVIS_OS_NAME}" = "linux" ]; then +if [ "${TRAVIS_OS_NAME}" = "osx" ]; then if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi fi |