[travis] Clang 3.8 for Qt4 builds

qgis · Apr 9, 2016 · 79e3e0e · 79e3e0e
1 parent 156721b
commit 79e3e0e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,9 @@ matrix:
     # QT4 based build with Python 2.7 // using container based builds and prebuild binary dependencies in osgeo4travis
     - os: linux
       language: cpp
-      env: QT_VERSION=4
+      env:
+        - QT_VERSION=4
+        - LLVM_VERSION=3.8
       sudo: false
       cache:
         apt: true
@@ -14,12 +16,12 @@ matrix:
         postgresql: "9.4"
         apt:
           sources:
-            - llvm-toolchain-precise-3.6
+            - llvm-toolchain-precise-3.8
             - ubuntu-toolchain-r-test
             - george-edison55-precise-backports # doxygen 1.8.3
           packages:
             - bison
-            - clang-3.6
+            - clang-3.8
             - doxygen
             - flex
             - flip

diff --git a/ci/travis/linux/qt4/install.sh b/ci/travis/linux/qt4/install.sh
@@ -1,13 +1,13 @@
 mkdir build
 cd build
 
-ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-3.6
-ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-3.6
+ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-${LLVM_VERSION}
+ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERSION}
 
 ccache -s
 
-export CXX="clang++-3.6"
-export CC="clang-3.6"
+export CXX="clang++-${LLVM_VERSION}"
+export CC="clang-${LLVM_VERSION}"
 export PATH=${HOME}/osgeo4travis/bin:${PATH}
 
 cmake --version