| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001 |
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
| 3 | Date: Tue, 5 Jun 2018 11:11:10 -0300 |
| 4 | Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases |
| 5 | Organization: O.S. Systems Software LTDA. |
| 6 | |
| 7 | $ llvm-config-host --version |
| 8 | 5.0.0git-9a5c333388c |
| 9 | |
| 10 | We need to ignore everything after 5.0.0 which is what the cut cmd is |
| 11 | doing |
| 12 | |
| 13 | Upstream-Status: Pending |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
| 16 | --- |
| 17 | configure.ac | 4 ++-- |
| 18 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/configure.ac b/configure.ac |
| 21 | index 916d0bd207..dd172f1ebe 100644 |
| 22 | --- a/configure.ac |
| 23 | +++ b/configure.ac |
| 24 | @@ -1090,7 +1090,7 @@ strip_unwanted_llvm_flags() { |
| 25 | |
| 26 | llvm_set_environment_variables() { |
| 27 | if test "x$LLVM_CONFIG" != xno; then |
| 28 | - LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` |
| 29 | + LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5` |
| 30 | LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` |
| 31 | LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` |
| 32 | LLVM_LIBDIR=`$LLVM_CONFIG --libdir` |
| 33 | @@ -2808,7 +2808,7 @@ detect_old_buggy_llvm() { |
| 34 | dnl ourselves. |
| 35 | dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) |
| 36 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, |
| 37 | - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` |
| 38 | + LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5` |
| 39 | AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) |
| 40 | |
| 41 | if test "x$llvm_have_one_so" = xyes; then |
| 42 | -- |
| 43 | 2.18.0 |
| 44 | |