From ce7b9ff6517fda089f296b2af2c1c49604872514 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 5 Jun 2018 11:11:10 -0300 Subject: [PATCH 3/4] Properly get LLVM version when using LLVM Git releases Organization: O.S. Systems Software LTDA. $ llvm-config-host --version 5.0.0git-9a5c333388c We need to ignore everything after 5.0.0 which is what the cut cmd is doing Upstream-Status: Pending Signed-off-by: Khem Raj Signed-off-by: Otavio Salvador Signed-off-by: Fabio Berton --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1816a4cd475..13fed9daf59 100644 --- a/configure.ac +++ b/configure.ac @@ -1124,7 +1124,7 @@ strip_unwanted_llvm_flags() { llvm_set_environment_variables() { if test "x$LLVM_CONFIG" != xno; then - LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` + LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5` LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` LLVM_LIBDIR=`$LLVM_CONFIG --libdir` @@ -2870,7 +2870,7 @@ detect_old_buggy_llvm() { dnl ourselves. dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` + LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5` AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) if test "x$llvm_have_one_so" = xyes; then -- 2.21.0