diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-08 15:11:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-08 15:11:13 -0500 |
commit | 10ef1d9a1e7e6a0b3701d262cf1b889620fdbbc9 (patch) | |
tree | 5d43e76b99147324ee15705b3beb40aa6e85cda4 /.travis.yml | |
parent | ce919c3ddf8084173bf2050e7e32a91b0818777c (diff) | |
parent | cc372a071bb417c83cd5dbca008bda1c438af4d5 (diff) | |
download | googletest-10ef1d9a1e7e6a0b3701d262cf1b889620fdbbc9.tar.gz googletest-10ef1d9a1e7e6a0b3701d262cf1b889620fdbbc9.tar.bz2 googletest-10ef1d9a1e7e6a0b3701d262cf1b889620fdbbc9.zip |
Merge branch 'master' into use-system-includes
Diffstat (limited to '.travis.yml')
-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 |