sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disable g++4.9 build which gets killed / use clang 3.6 to prepare for c++14 support

Browse source
This commit is contained in:
Dane Springmeyer 2016-01-29 16:05:09 -08:00
parent bc89f7f877
commit 0291e851fe
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.travis.yml
View file

@ -15,9 +15,9 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.5 - llvm-toolchain-precise-3.6
packages: packages:
- clang-3.5 - clang-3.6
cache: cache:
directories: directories:
@ -32,13 +32,15 @@ matrix:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6' ] sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6' ]
packages: [ 'clang-3.6', 'libstdc++-4.9-dev', 'libstdc++6' ] packages: [ 'clang-3.6', 'libstdc++-4.9-dev', 'libstdc++6' ]
- os: linux # OOM killer knocking out build on render_markers_symbolizer.cpp
compiler: gcc #
env: JOBS=6 CXX="ccache g++-4.9" CC="gcc-4.9" #- os: linux
addons: # compiler: gcc
apt: # env: JOBS=6 CXX="ccache g++-4.9" CC="gcc-4.9"
sources: [ 'ubuntu-toolchain-r-test' ] # addons:
packages: [ 'gcc-4.9', 'g++-4.9', 'libstdc++-4.9-dev', 'libstdc++6' ] # apt:
# sources: [ 'ubuntu-toolchain-r-test' ]
# packages: [ 'gcc-4.9', 'g++-4.9', 'libstdc++-4.9-dev', 'libstdc++6' ]
- os: osx - os: osx
compiler: clang compiler: clang
osx_image: xcode7 # upgrades clang from 6 -> 7 osx_image: xcode7 # upgrades clang from 6 -> 7