summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan A. Suarez Romero <[email protected]>2018-08-06 10:19:40 +0200
committerJuan A. Suarez Romero <[email protected]>2018-08-07 19:29:29 +0200
commit03cff7ecd8a36b2069a32e660122d091af9ff801 (patch)
tree2cf481af4624e975f3139839b30fc03c580f8e17
parent80f937ea4db301f5cf53691532a65a8c660e57d4 (diff)
travis: meson/Vulkan requires LLVM 6.0
RADV now requires LLVM 6.0. Fixes: fd1121e8399 ("amd: remove support for LLVM 5.0") CC: Marek Olšák <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]>
-rw-r--r--.travis.yml8
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 9e45eca8d64..9e07c4b8fe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,17 +36,19 @@ matrix:
- LABEL="meson Vulkan"
- BUILD=meson
- MESON_OPTIONS="-Ddri-drivers=[] -Dgallium-drivers=[]"
- - LLVM_VERSION=5.0
+ - LLVM_VERSION=6.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
addons:
apt:
sources:
- - llvm-toolchain-trusty-5.0
+ - llvm-toolchain-trusty-6.0
+ # llvm-6 depends on gcc-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
- libexpat1-dev