[Mesa-dev] [PATCH v5 20/20] configure.ac: Create correct LLVM_VERSION_INT with minor >= 10

Tobias Droste tdroste at gmx.de
Sat Nov 19 01:39:12 UTC 2016


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

Signed-off-by: Tobias Droste <tdroste at gmx.de>
---
 configure.ac | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5fc2c87..4cdd0cc 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
-- 
2.10.2



More information about the mesa-dev mailing list