summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-05-02 15:12:15 -0400
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-05-04 11:59:39 -0700
commit2b0892aaaaeaabf5d9fb9f82e8d76c3b4f111864 (patch)
tree2fabdc36f8ec7311a3b744585dc074e8ea5e4696 /.travis.yml
parent539d1be219f164b1e4f096a76ca24056305ab2e8 (diff)
downloadqtlocation-mapboxgl-2b0892aaaaeaabf5d9fb9f82e8d76c3b4f111864.tar.gz
Build with gcc 4.9
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index a98045c50d..b867735101 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,23 +7,23 @@ matrix:
- os: linux
include:
- os: linux
- env: FLAVOR=linux CXX=g++-4.8 BUILDTYPE=Release
+ env: FLAVOR=linux CXX=g++-4.9 BUILDTYPE=Release
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
- packages: [ 'gdb', 'g++-4.8', 'gcc-4.8', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
+ 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
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
- packages: [ 'gdb', 'libgcc-4.8-dev', 'libstdc++-4.8-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
+ packages: [ 'gdb', '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
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
- packages: [ 'gdb', 'libgcc-4.8-dev', 'libstdc++-4.8-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
+ packages: [ 'gdb', '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