[Mesa-dev] [PATCH 14/17] configure.ac: correctly manage llvm auto-detection

Emil Velikov emil.l.velikov at gmail.com
Tue Feb 7 22:44:56 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

Earlier refactoring commits changed from one, dare I say it, broken
behaviour to another. Namely:

Before, as you explicitly --enable-gallium-llvm your selection was
ignored when llvm-config was not present/detected.
Today, the "auto" heuristics enables gallium llvm regardless if you have
llvm/llvm-config available or not.

Rework the auto-detection to attribute for llvm's presence.

Cc: Tobias Droste <tdroste at gmx.de>
Cc: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Cc: "17.0" <mesa-stable at lists.freedesktop.org>
Reported-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Tobias Droste <tdroste at gmx.de>
---
Samuel can you check thing on your end ?
Configure should now succeed without touching --enable-gallium-llvm if
llvm-config is missing on the system.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a781a19a3c..22758d9702 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1724,7 +1724,7 @@ AC_ARG_ENABLE([gallium-llvm],
     [enable_gallium_llvm="$enableval"],
     [enable_gallium_llvm=auto])
 
-if test "x$enable_gallium_llvm" = xauto; then
+if test "x$enable_gallium_llvm" = xauto -a "x$FOUND_LLVM" = xyes; then
     case "$host_cpu" in
     i*86|x86_64|amd64) enable_gallium_llvm=yes;;
     *) enable_gallium_llvm=no;;
-- 
2.11.0



More information about the mesa-dev mailing list