diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-08 11:09:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 11:09:01 -0500 |
| commit | 4d1f930af878dbd929f33088c375175896f4e365 (patch) | |
| tree | 79bac56e193645c721c8a99336ba996319fa7a20 | |
| parent | 887a6c642006aa7475bdedb2b3652feb6a05f417 (diff) | |
| parent | efc6abae678ff9142fb36b5f0f35b7a118772061 (diff) | |
| download | googletest-4d1f930af878dbd929f33088c375175896f4e365.tar.gz | |
Merge pull request #1345 from coryan/fix-travis-build-macOS
Fix Travis build
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 68acbd36..797c2898 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ install: # /usr/bin/gcc is 4.6 always, but gcc-X.Y is available. -- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi +- if [ "$CXX" = "g++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi # /usr/bin/clang is 3.4, lets override with modern one. - if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; ln -sf /usr/bin/ccache /$HOME/bin/$CXX; ln -sf /usr/bin/ccache /$HOME/bin/$CC; fi # ccache on OS X needs installation first |