Mesa (master): configure.ac: correctly manage llvm auto-detection
Emil Velikov
evelikov at kemper.freedesktop.org
Fri Feb 10 11:53:31 UTC 2017
Module: Mesa
Branch: master
Commit: d4840c0c26315fe4f0ba82e2b0d81cd9f2636f5e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4840c0c26315fe4f0ba82e2b0d81cd9f2636f5e
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Wed Jan 18 13:54:04 2017 +0000
configure.ac: correctly manage llvm auto-detection
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.
v2: Set enable_gallium_llvm=no when LLVM is not found.
Cc: "17.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Tobias Droste <tdroste at gmx.de>
Reported-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Tested-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
configure.ac | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1251b83..af0a3fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1729,10 +1729,14 @@ AC_ARG_ENABLE([gallium-llvm],
[enable_gallium_llvm=auto])
if test "x$enable_gallium_llvm" = xauto; then
- case "$host_cpu" in
- i*86|x86_64|amd64) enable_gallium_llvm=yes;;
- *) enable_gallium_llvm=no;;
- esac
+ if test "x$FOUND_LLVM" = xyes; then
+ case "$host_cpu" in
+ i*86|x86_64|amd64) enable_gallium_llvm=yes;;
+ *) enable_gallium_llvm=no;;
+ esac
+ else
+ enable_gallium_llvm=no
+ fi
fi
if test "x$enable_gallium_llvm" = xyes -a "x$FOUND_LLVM" = xno; then
More information about the mesa-commit
mailing list