diff options
| -rw-r--r-- | .travis.yml | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 32cd8602e6f..90f9ec40e12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ matrix: apt: sources: - llvm-toolchain-trusty-6.0 - # llvm-6 depends on gcc-4.9 which is not in main repo + # llvm-6 requires libstdc++4.9 which is not in main repo - ubuntu-toolchain-r-test packages: # From sources above @@ -98,10 +98,8 @@ matrix: - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=5.0 + - LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - OVERRIDE_CC="gcc-4.8" - - OVERRIDE_CXX="g++-4.8" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" @@ -111,12 +109,12 @@ matrix: addons: apt: sources: - - llvm-toolchain-trusty-5.0 + - llvm-toolchain-trusty-6.0 + # llvm-6 requires libstdc++4.9 which is not in main repo + - ubuntu-toolchain-r-test packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev # From sources above - - llvm-5.0-dev + - llvm-6.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev @@ -141,7 +139,7 @@ matrix: apt: sources: - llvm-toolchain-trusty-6.0 - # llvm-6 depends on gcc-4.9 which is not in main repo + # llvm-6 requires libstdc++4.9 which is not in main repo - ubuntu-toolchain-r-test packages: # From sources above @@ -314,7 +312,7 @@ matrix: apt: sources: - llvm-toolchain-trusty-6.0 - # llvm-6 depends on gcc-4.9 which is not in main repo + # llvm-6 requires libstdc++4.9 which is not in main repo - ubuntu-toolchain-r-test packages: - libclc-dev @@ -382,7 +380,7 @@ matrix: apt: sources: - llvm-toolchain-trusty-6.0 - # llvm-6 depends on gcc-4.9 which is not in main repo + # llvm-6 requires libstdc++4.9 which is not in main repo - ubuntu-toolchain-r-test packages: # From sources above @@ -436,21 +434,19 @@ matrix: - BUILD=scons - SCONSFLAGS="-j4" - SCONS_TARGET="swr=1" - - LLVM_VERSION=5.0 + - LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" # Keep it symmetrical to the make build. There's no actual SWR, yet. - SCONS_CHECK_COMMAND="true" - - OVERRIDE_CC="gcc-4.8" - - OVERRIDE_CXX="g++-4.8" addons: apt: sources: - - llvm-toolchain-trusty-5.0 + - llvm-toolchain-trusty-6.0 + # llvm-6 requires libstdc++4.9 which is not in main repo + - ubuntu-toolchain-r-test packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev # From sources above - - llvm-5.0-dev + - llvm-6.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev |