From d24839be70d66cb74f4eb3c5f76b7ed634bdc7d3 Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Mon, 18 Jun 2018 15:45:51 +0200 Subject: 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 Cc: Emil Velikov Cc: Dylan Baker Cc: Eric Engestrom Reviewed-by: Eric Engestrom Reviewed-by: Emil Velikov Acked-by: Bruce Cherniak --- src/gallium/drivers/swr/Makefile.am | 6 +++--- src/gallium/drivers/swr/SConscript | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gallium/drivers/swr') diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index 8b3150288e6..5cc3f77478a 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -374,9 +374,9 @@ include $(top_srcdir)/install-gallium-links.mk # created with the oldest supported version of LLVM. dist-hook: if SWR_INVALID_LLVM_VERSION - @echo "*******************************************************" - @echo "LLVM 4.0.0 or LLVM 4.0.1 required to create the tarball" - @echo "*******************************************************" + @echo "*****************************************" + @echo "LLVM 5.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 528cfac39f6..224372eb3f5 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('4.0'): - print("warning: swr requires LLVM >= 4.0: not building swr") +if env['LLVM_VERSION'] < distutils.version.LooseVersion('5.0'): + print("warning: swr requires LLVM >= 5.0: not building swr") env['swr'] = False Return() -- cgit v1.2.3