Skip to content

Commit 79e3e0e

Browse files
committed
[travis] Clang 3.8 for Qt4 builds
1 parent 156721b commit 79e3e0e

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ matrix:
33
# QT4 based build with Python 2.7 // using container based builds and prebuild binary dependencies in osgeo4travis
44
- os: linux
55
language: cpp
6-
env: QT_VERSION=4
6+
env:
7+
- QT_VERSION=4
8+
- LLVM_VERSION=3.8
79
sudo: false
810
cache:
911
apt: true
@@ -14,12 +16,12 @@ matrix:
1416
postgresql: "9.4"
1517
apt:
1618
sources:
17-
- llvm-toolchain-precise-3.6
19+
- llvm-toolchain-precise-3.8
1820
- ubuntu-toolchain-r-test
1921
- george-edison55-precise-backports # doxygen 1.8.3
2022
packages:
2123
- bison
22-
- clang-3.6
24+
- clang-3.8
2325
- doxygen
2426
- flex
2527
- flip

ci/travis/linux/qt4/install.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
mkdir build
22
cd build
33

4-
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-3.6
5-
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-3.6
4+
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-${LLVM_VERSION}
5+
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERSION}
66

77
ccache -s
88

9-
export CXX="clang++-3.6"
10-
export CC="clang-3.6"
9+
export CXX="clang++-${LLVM_VERSION}"
10+
export CC="clang-${LLVM_VERSION}"
1111
export PATH=${HOME}/osgeo4travis/bin:${PATH}
1212

1313
cmake --version

0 commit comments

Comments
 (0)