From 9798d94952574343c62df59a43e3a267abb0cb00 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte <alexis.lagoutte@gmail.com> Date: Mon, 24 Dec 2018 13:51:02 +0000 Subject: [PATCH] .travis(.yml): no longer need llvm-toolchain-trusty-7 clang-7 is enable by default --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 073a24cb..1d5c9666 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: -- GitLab