summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJuan A. Suarez Romero <jasuarez@igalia.com>2018-06-18 15:45:51 +0200
committerJuan A. Suarez Romero <jasuarez@igalia.com>2018-06-21 12:16:46 +0200
commitd24839be70d66cb74f4eb3c5f76b7ed634bdc7d3 (patch)
tree77d618f894daab9c23cddbc1fab9b789079b1059 /.travis.yml
parentf966929805f722ae38d4821fab61765c0ee4a60c (diff)
downloadmesa-d24839be70d66cb74f4eb3c5f76b7ed634bdc7d3.tar.gz
mesa-d24839be70d66cb74f4eb3c5f76b7ed634bdc7d3.tar.bz2
mesa-d24839be70d66cb74f4eb3c5f76b7ed634bdc7d3.zip
swr: bump minimum supported LLVM version to 5.0
RADV now requires LLVM 5.0 or greater, and thus we can't build dist tarball because swr requires LLVM 4.0. Let's bump required LLVM to 5.0 in swr too. Fixes: f9eb1ef870 ("amd: remove support for LLVM 4.0") Cc: Tim Rowley <timothy.o.rowley@intel.com> Cc: Emil Velikov <emil.velikov@collabora.com> Cc: Dylan Baker <dylan@pnwbakers.com> Cc: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Bruce Cherniak <bruce.cherniak@intel.com>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index b1fc7de9587..c9a30fa0ef5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,7 +92,7 @@ matrix:
- BUILD=make
- MAKEFLAGS="-j4"
- MAKE_CHECK_COMMAND="true"
- - LLVM_VERSION=4.0
+ - LLVM_VERSION=5.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- OVERRIDE_CC="gcc-4.8"
- OVERRIDE_CXX="g++-4.8"
@@ -105,12 +105,12 @@ matrix:
addons:
apt:
sources:
- - llvm-toolchain-trusty-4.0
+ - llvm-toolchain-trusty-5.0
packages:
# LLVM packaging is broken and misses these dependencies
- libedit-dev
# From sources above
- - llvm-4.0-dev
+ - llvm-5.0-dev
# Common
- xz-utils
- x11proto-xf86vidmode-dev
@@ -432,7 +432,7 @@ matrix:
- BUILD=scons
- SCONSFLAGS="-j4"
- SCONS_TARGET="swr=1"
- - LLVM_VERSION=4.0
+ - LLVM_VERSION=5.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
# Keep it symmetrical to the make build. There's no actual SWR, yet.
- SCONS_CHECK_COMMAND="true"
@@ -441,13 +441,13 @@ matrix:
addons:
apt:
sources:
- - llvm-toolchain-trusty-4.0
+ - llvm-toolchain-trusty-5.0
packages:
- scons
# LLVM packaging is broken and misses these dependencies
- libedit-dev
# From sources above
- - llvm-4.0-dev
+ - llvm-5.0-dev
# Common
- xz-utils
- x11proto-xf86vidmode-dev