Mesa (master): configure.ac: Create correct LLVM_VERSION_INT with minor >= 10

Emil Velikov evelikov at kemper.freedesktop.org
Mon Dec 5 14:45:02 UTC 2016


Module: Mesa
Branch: master
Commit: 0e9a5be7e74fa2a9bd2a634ef60822bd6600ca1d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e9a5be7e74fa2a9bd2a634ef60822bd6600ca1d

Author: Tobias Droste <tdroste at gmx.de>
Date:   Sat Nov 19 02:39:12 2016 +0100

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

This makes sure that we handle LLVM minor version >= 10 correctly.

Signed-off-by: Tobias Droste <tdroste at gmx.de>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 configure.ac | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e731cf9..adca49d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -990,7 +990,11 @@ llvm_set_environment_variables() {
             LLVM_VERSION_PATCH=0
         fi
 
-        LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}"
+        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
 
         DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DMESA_LLVM_VERSION_PATCH=$LLVM_VERSION_PATCH"
         MESA_LLVM=1




More information about the mesa-commit mailing list