diff options
| author | Carlos O'Ryan <coryan@google.com> | 2017-12-06 15:33:27 -0500 |
|---|---|---|
| committer | Carlos O'Ryan <coryan@users.noreply.github.com> | 2017-12-06 22:43:39 -0500 |
| commit | 4aa05bd4ffb8148787bbcaa8780c9c522eb61b13 (patch) | |
| tree | 79042de4a55feaeaa514ee029737cd28c007510a /.travis.yml | |
| parent | a868e618c0607259c63f37d948b72586a13922ff (diff) | |
| download | googletest-4aa05bd4ffb8148787bbcaa8780c9c522eb61b13.tar.gz googletest-4aa05bd4ffb8148787bbcaa8780c9c522eb61b13.tar.bz2 googletest-4aa05bd4ffb8148787bbcaa8780c9c522eb61b13.zip | |
Only switch to g++-4.9 on Linux.
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 |