use clang-3.6 to dodge compile error around std::function - refs https://github.com/mapnik/mapnik/issues/3179#issuecomment-173743954
This commit is contained in:
parent
68a2ead2fd
commit
e52feaa44d
1 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue