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

try clang++5

Browse source
This commit is contained in:
Dane Springmeyer 2018-03-16 08:42:09 -07:00
parent de7bb84d1e
commit 4164675af7
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.travis.yml
View file

@ -33,7 +33,7 @@ matrix:
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang" compiler: ": clang"
env: JOBS=8 CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" ENABLE_GLIBC_WORKAROUND=true TRIGGER=true env: JOBS=8 CXX="ccache clang++-5.0 -Qunused-arguments" CC="clang-5.0" ENABLE_GLIBC_WORKAROUND=true TRIGGER=true
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test']
@ -41,7 +41,7 @@ matrix:
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang-coverage" compiler: ": clang-coverage"
env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" env: JOBS=8 COVERAGE=true CXX="ccache clang++-5.0 -Qunused-arguments" CC="clang-5.0"
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test']
@ -84,12 +84,12 @@ before_script:
- source bootstrap.sh - source bootstrap.sh
- | - |
if [[ $(uname -s) == 'Linux' ]]; then if [[ $(uname -s) == 'Linux' ]]; then
mason install clang++ 3.9.1 mason install clang++ 5.0.1
export PATH=$(mason prefix clang++ 3.9.1)/bin:${PATH} export PATH=$(mason prefix clang++ 5.0.1)/bin:${PATH}
mason install llvm-cov 3.9.1 mason install llvm-cov 5.0.1
export PATH=$(mason prefix llvm-cov 3.9.1)/bin:${PATH} export PATH=$(mason prefix llvm-cov 5.0.1)/bin:${PATH}
which llvm-cov which llvm-cov
export LLVM_COV="$(mason prefix llvm-cov 3.9.1)/bin/llvm-cov" export LLVM_COV="$(mason prefix llvm-cov 5.0.1)/bin/llvm-cov"
fi fi
- ccache --version - ccache --version
- ccache -p || true - ccache -p || true

2
bootstrap.sh
View file

@ -11,7 +11,7 @@ todo
- shrink icu data - shrink icu data
' '
MASON_VERSION="e4c1746" MASON_VERSION="40ca8d2"
function setup_mason() { function setup_mason() {
if [[ ! -d ./.mason ]]; then if [[ ! -d ./.mason ]]; then