summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-05-02 14:58:09 -0400
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-05-04 12:01:15 -0700
commitec3fb8880f5be5051bba5c91287ef47b0bd97d2f (patch)
treea1d716e3ee11e09a5454868959c69d4555d05cb5 /.travis.yml
parent2b0892aaaaeaabf5d9fb9f82e8d76c3b4f111864 (diff)
downloadqtlocation-mapboxgl-ec3fb8880f5be5051bba5c91287ef47b0bd97d2f.tar.gz
Build with clang 3.5
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index b867735101..b2dae3cf00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,17 +13,17 @@ matrix:
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'gdb', 'g++-4.9', 'gcc-4.9', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- os: linux
- env: FLAVOR=linux CXX=clang++ BUILDTYPE=Debug
+ env: FLAVOR=linux CXX=clang++-3.5 BUILDTYPE=Debug
addons:
apt:
- sources: [ 'ubuntu-toolchain-r-test' ]
- packages: [ 'gdb', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
+ sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
+ packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- os: linux
- env: FLAVOR=linux CXX=clang++ BUILDTYPE=Release
+ env: FLAVOR=linux CXX=clang++-3.5 BUILDTYPE=Release
addons:
apt:
- sources: [ 'ubuntu-toolchain-r-test' ]
- packages: [ 'gdb', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
+ sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
+ packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- os: osx
env: FLAVOR=osx BUILDTYPE=Debug
- os: osx