[travis] Clang 3.8 for Qt5 buildss

m-kuhn · m-kuhn · commit e7c7f85b307a · 2016-04-09T15:14:56.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -54,7 +54,9 @@ matrix:
     # QT5 based build with Python 3 // using container based builds and prebuild binary dependencies in osgeo4travis
     - os: linux
       language: python # This lets us use newer python versions from virtualenv
-      env: QT_VERSION=5
+      env:
+        - QT_VERSION=5
+        - LLVM_VERSION=3.8
       sudo: false
       cache:
         apt: true
@@ -66,7 +68,7 @@ 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:
@@ -81,7 +83,7 @@ matrix:
             - txt2tags
             - xvfb
             - flip
-            - clang-3.6
+            - clang-3.8
     # OSX based build with QT4 and Python 2
     - os: osx
 
diff --git a/ci/travis/linux/qt5/install.sh b/ci/travis/linux/qt5/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}
 export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/
 
