From ab13c63470034a0a45a39ae886ea14d2bafd767f Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 5 Jul 2016 12:02:01 +0200 Subject: [PATCH] [travis] Use clang for Qt5 builds (#3275) To get warnings from different compilers --- .travis.yml | 5 ++--- ci/travis/linux/qt5/install.sh | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8d6980088f0..028ebc43bc7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ matrix: postgresql: "9.4" apt: sources: -# - llvm-toolchain-precise-3.8 + - llvm-toolchain-precise-3.8 - ubuntu-toolchain-r-test - george-edison55-precise-backports # doxygen 1.8.3 packages: @@ -91,8 +91,7 @@ matrix: - txt2tags - xvfb - flip - - gcc-6 - - g++-6 + - clang-3.8 # OSX based build with QT4 and Python 2 - os: osx env: diff --git a/ci/travis/linux/qt5/install.sh b/ci/travis/linux/qt5/install.sh index 5e16a6860310..b361d009de90 100755 --- a/ci/travis/linux/qt5/install.sh +++ b/ci/travis/linux/qt5/install.sh @@ -18,15 +18,13 @@ cd build ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-${LLVM_VERSION} ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERSION} -ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/g++-6 -ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/gcc-6 ccache -s -#export CXX="clang++-${LLVM_VERSION}" -#export CC="clang-${LLVM_VERSION}" -export CXX="g++-6" -export CC="gcc-6" +export CXX="clang++-${LLVM_VERSION}" +export CC="clang-${LLVM_VERSION}" +#export CXX="g++-6" +#export CC="gcc-6" export PATH=${HOME}/osgeo4travis/bin:${PATH} export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/