From 0cef0cccf51fc20d797edef458a09af73108260c Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Mon, 6 Aug 2018 11:30:08 +0200 Subject: swr: bump minimum supported LLVM version to 6.0 RADV now requires LLVM 6.0 or greater, and thus we can't build dist tarball because swr requires LLVM 5.0. Let's bump required LLVM to 6.0 in swr too. v2: bump also in meson.build (Eric) Fixes: fd1121e839 ("amd: remove support for LLVM 5.0") Cc: Tim Rowley Cc: Emil Velikov Cc: Dylan Baker Cc: Eric Engestrom Reviewed-by: Eric Engestrom Reviewed-by: Bruce Cherniak --- src/gallium/drivers/swr/Makefile.am | 2 +- src/gallium/drivers/swr/SConscript | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index 5cc3f77478a..d20a6bdbed3 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -375,7 +375,7 @@ include $(top_srcdir)/install-gallium-links.mk dist-hook: if SWR_INVALID_LLVM_VERSION @echo "*****************************************" - @echo "LLVM 5.0.x required to create the tarball" + @echo "LLVM 6.0.x required to create the tarball" @echo "*****************************************" @test endif diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript index 224372eb3f5..a89d02c5db0 100644 --- a/src/gallium/drivers/swr/SConscript +++ b/src/gallium/drivers/swr/SConscript @@ -12,8 +12,8 @@ if not env['llvm']: env['swr'] = False Return() -if env['LLVM_VERSION'] < distutils.version.LooseVersion('5.0'): - print("warning: swr requires LLVM >= 5.0: not building swr") +if env['LLVM_VERSION'] < distutils.version.LooseVersion('6.0'): + print("warning: swr requires LLVM >= 6.0: not building swr") env['swr'] = False Return() -- cgit v1.2.3