diff options
| author | dmauro <dmauro@google.com> | 2020-05-28 19:37:07 (GMT) |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2020-05-28 23:55:32 (GMT) |
| commit | 859bfe8981d6724c4ea06e73d29accd8588f3230 (patch) | |
| tree | b68d5c9b26d7f2ca3bd6a89ebc3982947db2a346 /ci/env-linux.sh | |
| parent | fd32ba66e2408f2599f9b03a9b2b1ef2c272b7e3 (diff) | |
| download | googletest-859bfe8981d6724c4ea06e73d29accd8588f3230.zip googletest-859bfe8981d6724c4ea06e73d29accd8588f3230.tar.gz googletest-859bfe8981d6724c4ea06e73d29accd8588f3230.tar.bz2 | |
Googletest export
Update Travis CI to use Ubuntu Bionic in some cases
PiperOrigin-RevId: 313639562
Diffstat (limited to 'ci/env-linux.sh')
| -rwxr-xr-x | ci/env-linux.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/env-linux.sh b/ci/env-linux.sh index 37800d6..7d2b8a8 100755 --- a/ci/env-linux.sh +++ b/ci/env-linux.sh @@ -36,6 +36,6 @@ # TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}. if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi + if [ "$CXX" = "g++" ]; then export CXX="g++" CC="gcc"; fi + if [ "$CXX" = "clang++" ]; then export CXX="clang++" CC="clang"; fi fi |