Skip to content
Snippets Groups Projects
Commit 9798d949 authored by Alexis La Goutte's avatar Alexis La Goutte Committed by Tatsuhiro Tsujikawa
Browse files

.travis(.yml): no longer need llvm-toolchain-trusty-7

clang-7 is enable by default
parent c8020327
No related merge requests found
...@@ -19,10 +19,8 @@ addons: ...@@ -19,10 +19,8 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-7
packages: packages:
- g++-8 - g++-8
- clang-7
- autoconf - autoconf
- automake - automake
- autotools-dev - autotools-dev
...@@ -37,7 +35,7 @@ addons: ...@@ -37,7 +35,7 @@ addons:
before_install: before_install:
- $CC --version - $CC --version
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then CMAKE_OPTS=" -DENABLE_ASAN=1" AUTOTOOLS_OPTS=" --enable-asan"; fi - 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 - $CC --version
- cmake --version - cmake --version
before_script: before_script:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment