From e52feaa44d5b7716bc40b8028dfb696a93ea6329 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 21 Jan 2016 15:09:33 -0800 Subject: [PATCH] use clang-3.6 to dodge compile error around std::function - refs https://github.com/mapnik/mapnik/issues/3179#issuecomment-173743954 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a0cd88cce..aa2711014 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,17 +21,17 @@ matrix: include: - os: linux compiler: clang - env: JOBS=8 CXX="ccache clang++-3.5 -Qunused-arguments" CC="clang-3.5" MASON_PUBLISH=true + env: JOBS=8 CXX="ccache clang++-3.6 -Qunused-arguments" CC="clang-3.6" MASON_PUBLISH=true addons: apt: - sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6' ] + sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6' ] + packages: [ 'clang-3.6', 'libstdc++-4.9-dev', 'libstdc++6' ] - os: linux compiler: gcc env: JOBS=6 CXX="ccache g++-4.9" CC="ccache gcc-4.9" addons: apt: - sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ] + sources: [ 'ubuntu-toolchain-r-test' ] packages: [ 'gcc-4.9', 'g++-4.9', 'libstdc++-4.9-dev', 'libstdc++6' ] - os: osx compiler: clang