diff options
| -rw-r--r-- | .travis.yml | 25 | ||||
| -rw-r--r-- | configure.seed | 3 |
2 files changed, 12 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index c75b60320..f845b0348 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: c os: - - osx + # - osx # tmp disable osx - linux compiler: @@ -18,30 +18,31 @@ matrix: sources: - ubuntu-toolchain-r-test packages: - - g++-7 + - g++-8 env: - - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + - os: linux - compiler: gcc + compiler: gcc-9 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-8 + - g++-9 env: - - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" - os: linux - compiler: gcc + compiler: clang-8 addons: apt: sources: - - ubuntu-toolchain-r-test + - llvm-toolchain-xenial-8 packages: - - g++-9 + - clang-8 env: - - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" + - MATRIX_EVAL="CC=clang-8 && CXX=clang++-8" @@ -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 diff --git a/configure.seed b/configure.seed index fbc30ae07..9d60c8944 100644 --- a/configure.seed +++ b/configure.seed @@ -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= |