From b9137584347f7f8b4488c6db0f9ca3f729867e65 Mon Sep 17 00:00:00 2001 From: Alek Mosingiewicz Date: Sun, 19 Aug 2018 17:31:01 +0200 Subject: [PATCH] Another attempt to fix Travis config for clang. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0aa4eb4..e769fbcf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,11 +40,11 @@ matrix: - os: osx compiler: clang osx_image: xcode9.4 - env: CLANGCC="clang-6.0" CLANGCXX="clang++-6.0" CMAKE_OPTIONS="-stdlib=libc++" + env: CLANG_VER=3.7 - os: osx compiler: clang osx_image: xcode9.4 - env: CLANGCC="clang-6.0" CLANGCXX="clang++-6.0" CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE -stdlib=libc++" BUILD_ONLY=1 + env: CLANG_VER=3.7 CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE" BUILD_ONLY=1 env: global: @@ -54,8 +54,7 @@ env: before_install: - if [ "${GCC_VER}" != "" ]; then export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER" ; fi - - if [ "${CLANGCC}" != "" ]; then export CC="$CLANGCC" ; fi - - if [ "${CLANGXX}" != "" ]; then export CXX="$CLANGXX" ; fi + - if [ "${CLANG_VER}" != "" ]; then export CXX="clang++-$CLANG_VER" CC="clang-$CLANG_VER" ; fi - pip install --user cpp-coveralls script: