diff --git a/.travis.yml b/.travis.yml index 073a24cb5e6faba22a1995b4ecf83c912c0b4e99..1d5c96663f4cbc74b7d9fa9fe950f817fc8e0a67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,8 @@ addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-7 packages: - g++-8 - - clang-7 - autoconf - automake - autotools-dev @@ -37,7 +35,7 @@ addons: before_install: - $CC --version - if [ "$TRAVIS_OS_NAME" == "linux" ]; then CMAKE_OPTS=" -DENABLE_ASAN=1" AUTOTOOLS_OPTS=" --enable-asan"; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$CXX" = "g++" ]; then export CXX="g++-8" CC="gcc-8" EXTRA_LDFLAGS="-fuse-ld=gold"; else export CXX="clang++-7" CC="clang-7"; fi; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$CXX" = "g++" ]; then export CXX="g++-8" CC="gcc-8" EXTRA_LDFLAGS="-fuse-ld=gold"; else export CXX="clang++" CC="clang"; fi; fi - $CC --version - cmake --version before_script: