From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Wed, 18 Jan 2017 13:54:01 +0000 (+0000)
Subject: Revert "configure.ac: Create correct LLVM_VERSION_INT with minor >= 10"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc30992a54dbf4274e8741ebd64f289e06b38096;p=mesa.git

Revert "configure.ac: Create correct LLVM_VERSION_INT with minor >= 10"

As stated in [1] by the LLVM devs, the new versioning scheme will not
deploy any minor version (i.e. it will always be zero). As such the
patch should not be needed.

This reverts commit 0e9a5be7e74fa2a9bd2a634ef60822bd6600ca1d.

[1] http://blog.llvm.org/2016/12/llvms-new-versioning-scheme.html
Reviewed-by: Tobias Droste <tdroste@gmx.de>
---

diff --git a/configure.ac b/configure.ac
index 9f94d8b3ac8..b2065d3fe14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -952,11 +952,7 @@ llvm_set_environment_variables() {
             LLVM_VERSION_PATCH=0
         fi
 
-        if test "$LLVM_VERSION_MINOR" -lt 10; then
-            LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}"
-        else
-            LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}"
-        fi
+        LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}"
 
         FOUND_LLVM=yes
     else