Remove gcc7, add clang 8

This commit is contained in:
Stuart Reilly
2019-07-17 11:44:44 +01:00
parent e923ca4f17
commit 79a0cfbcdb
2 changed files with 14 additions and 18 deletions
+14 -15
View File
@@ -1,7 +1,7 @@
language: c
os:
- osx
# - osx # tmp disable osx
- linux
compiler:
@@ -11,16 +11,6 @@ compiler:
matrix:
include:
- os: linux
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- os: linux
compiler: gcc
addons:
@@ -33,7 +23,7 @@ matrix:
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
- os: linux
compiler: gcc
compiler: gcc-9
addons:
apt:
sources:
@@ -43,6 +33,17 @@ matrix:
env:
- MATRIX_EVAL="CC=gcc-9 && CXX=g++-9"
- os: linux
compiler: clang-8
addons:
apt:
sources:
- llvm-toolchain-xenial-8
packages:
- clang-8
env:
- MATRIX_EVAL="CC=clang-8 && CXX=clang++-8"
exclude:
@@ -57,9 +58,7 @@ install:
#macos
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
#linux
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update || true; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install build-essential; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libpcap-dev libtool autoconf automake autogen; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libpcap-dev autogen; fi
before_script:
- ./autogen.sh
-3
View File
@@ -69,9 +69,6 @@ if test $SYSTEM = "Darwin"; then
CC=clang
fi
if test $ax_cv_PTHREAD_CLANG = "yes"; then
CC=clang
fi
HS_LIB=
HS_INC=