From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 28 May 2018 09:30:50 +0000 (+0200)
Subject: Travis: The default clang is now recent enough, don't force it
X-Git-Tag: dnsdist-1.3.1~62^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e0a958b1b86f627856dc39afbf69975f8ae730f;p=pdns

Travis: The default clang is now recent enough, don't force it

Travis switched to 5.0.0 while we were still forcing it to 3.6 for
the recursor, since the previous default was 3.5 which was too old.
---

diff --git a/.travis.yml b/.travis.yml
index e3ade1e03..b82211802 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,17 +9,6 @@ env:
   - PDNS_BUILD_PRODUCT=recursor
   - PDNS_BUILD_PRODUCT=dnsdist
 
-matrix:
-  exclude:
-    - compiler: clang
-      env: PDNS_BUILD_PRODUCT=recursor
-  include:
-    - compiler: clang
-      env: PDNS_BUILD_PRODUCT=recursor COMPILER=clang++-3.6
-      addons:
-        apt:
-          packages: ['clang-3.6']
-
 before_script:
   - git describe --always --dirty=+
   - sudo rm -f /etc/apt/sources.list.d/*.list
diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 18419017b..99efc4e0e 100755
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -405,7 +405,7 @@ build_recursor() {
   run "rm -f pdns-recursor-*.tar.bz2"
   run "cd pdns-recursor-*"
   # Build without --enable-botan, no botan 2.x in Travis CI
-  run "CXX=${COMPILER} ./configure \
+  run "./configure \
     ${sanitizerflags} \
     --prefix=$PDNS_RECURSOR_DIR \
     --enable-libsodium \