From dcedbccff8e022ffde03fb8b81f667e5e0f0ec0c Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Tue, 4 Apr 2017 12:08:47 +0200 Subject: [PATCH] Use clang 3.6 instead of 3.5 in Travis builds --- .travis.yml | 8 ++++++++ build-scripts/travis.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5498bcab3d..9260619702 100644 --- 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 bbeb86fd37..cc99ef03a2 100755 --- 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" -- 2.47.2