Use clang 3.6 instead of 3.5 in Travis builds

diff --git a/.travis.yml b/.travis.yml
index 5498bcab3de61fe4267f6dae8de472438651bd94..9260619702c857126dd9b48bc8e4ea43ab3562a2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,14 @@ matrix:
   exclude:
     - compiler: clang
       env: PDNS_BUILD_PRODUCT=docs
+    - 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=+

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index bbeb86fd371b6fe7b1b905cac43182e37d686268..cc99ef03a2d8e3413fe048a95999a304e7537938 100755 (executable)
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -397,7 +397,7 @@ build_recursor() {
   run "tar xf pdns-recursor-*.tar.bz2"
   run "rm -f pdns-recursor-*.tar.bz2"
   run "cd pdns-recursor-*"
-  run "CFLAGS='-O1' CXXFLAGS='-O1' ./configure \
+  run "CFLAGS='-O1' CXXFLAGS='-O1' CXX=${COMPILER} ./configure \
     --prefix=$PDNS_RECURSOR_DIR \
     --enable-unit-tests \
     --disable-silent-rules"