[Mesa-dev] [PATCH 2/2] configure.ac: drop SWR_INVALID_LLVM_VERSION workaround

[Emil Velikov]

Previously one of the SWR python generators would create wrappers for
LLVM functions. Every Create* API would have one, even though we only
needed about a quarter of them.

Additionally this meant  that we could not create create the file with
one LLVM version and compile with another.

Cc: Dylan Baker <dylan at pnwbakers.com>
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 configure.ac                        |  4 ----
 src/gallium/drivers/swr/Makefile.am | 10 ----------
 2 files changed, 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index c7bf5cf3591..c57a6960148 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2823,10 +2823,6 @@ if test -n "$with_gallium_drivers"; then
     done
 fi
 
-# XXX: Keep in sync with LLVM_REQUIRED_SWR
-AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x6.0.0 -a \
-                                              "x$LLVM_VERSION" != x6.0.1)
-
 if test "x$enable_llvm" = "xyes" -a "$with_gallium_drivers"; then
     llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium"
     llvm_add_default_components "gallium"
diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
index 3390ef6b096..3137f4a3cdd 100644
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -370,16 +370,6 @@ endif
 
 include $(top_srcdir)/install-gallium-links.mk
 
-# Generated gen_builder.hpp is not backwards compatible. So ship only one
-# created with the oldest supported version of LLVM.
-dist-hook:
-if SWR_INVALID_LLVM_VERSION
-	@echo "*****************************************"
-	@echo "LLVM 6.0.x required to create the tarball"
-	@echo "*****************************************"
-	@test
-endif
-
 EXTRA_DIST = \
 	SConscript \
 	meson.build \
-- 
2.20.1