From: Tobias Droste <tdroste@gmx.de>
Date: Sat, 28 Jan 2017 13:57:00 +0000 (+0100)
Subject: configure.ac: Don't check LLVM version in require_llvm
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f64d4d82bd877418a553827cf0ffb9d5742127a8;p=mesa.git

configure.ac: Don't check LLVM version in require_llvm

This is actually not needed because the version is checked later.

Around line 2380
if test "x$enable_gallium_llvm" == "xyes"; then
    llvm_check_version_for $LLVM_REQUIRED_GALLIUM "gallium"
    llvm_add_default_components "gallium"
fi

Cc: "17.0" <mesa-stable@lists.freedesktop.org>
Cc: Tobias Droste <tdroste@gmx.de>
Signed-off-by: Tobias Droste <tdroste@gmx.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com> (v1)
v2: [Emil Velikov: rebase/respin series order]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/configure.ac b/configure.ac
index 788561d207e..8fd7b6f001c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2199,9 +2199,7 @@ dnl
 dnl Gallium helper functions
 dnl
 gallium_require_llvm() {
-    if test "x$enable_gallium_llvm" = "xyes"; then
-        llvm_check_version_for $LLVM_REQUIRED_GALLIUM "gallium"
-    else
+    if test "x$enable_gallium_llvm" != "xyes"; then
         AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
     fi
 }