[Mesa-dev] [PATCH v4 12/18] configure.ac: Move llvm_set_environment_variables higher.

Tobias Droste tdroste at gmx.de
Sun Oct 16 00:20:49 UTC 2016


This moves the function to get the LLVM environment variables higher
in the file. It still needs to be below the "--enable-opencl" because
it uses $enable_opencl.
It can be called without condition now as it only throws errors if
openCL is enabled.

This patch just prepares the next patch.

Signed-off-by: Tobias Droste <tdroste at gmx.de>
---
 configure.ac | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 35034d3..62825b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1180,6 +1180,8 @@ AC_ARG_ENABLE([gallium-tests],
     [enable_gallium_tests="$enableval"],
     [enable_gallium_tests=no])
 
+llvm_set_environment_variables
+
 # Option for Gallium drivers
 
 # Keep this in sync with the --with-gallium-drivers help string default value
@@ -2326,12 +2328,6 @@ if test "x$enable_gallium_llvm" = xauto; then
     i*86|x86_64|amd64) enable_gallium_llvm=yes;;
     esac
 fi
-if test "x$enable_gallium_llvm" = xyes || test "x$HAVE_RADEON_VULKAN" = xyes; then
-    llvm_set_environment_variables
-else
-    MESA_LLVM=0
-    LLVM_VERSION_INT=0
-fi
 
 dnl Directory for XVMC libs
 AC_ARG_WITH([xvmc-libdir],
-- 
2.10.1



More information about the mesa-dev mailing list