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 e3ade1e037ef6a82aaa5069284964dc52e16985a..b82211802d835a6922a9644db4fba66ae504f22c 100644 (file)
--- 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 18419017b60e9e123c49804f41e2f0f08a2af39c..99efc4e0e6f055125ead81d0b9e7915db22d4898 100755 (executable)
--- 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 \