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

[Tobias Droste]

Reviewed-by: Tobias Droste <tdroste at gmx.de> for v2, too

Am Donnerstag, 9. Februar 2017, 20:57:45 CET schrieb Emil Velikov:
> 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.
> 
> v2: Set enable_gallium_llvm=no when LLVM is not found.
> 
> 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> (v1)
> ---
> Samuel, v2 is a trivial change which should be a NFC.
> If you want to test it over v1 fetch
> https://github.com/evelikov/Mesa/commits/rev3.1-llvm
> ---
>  configure.ac | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 43ea9590ed..d42276aece 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1722,10 +1722,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