blob: 96edc2172b002e6f36dd01b86c40fb83248d3ec8 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From ce7b9ff6517fda089f296b2af2c1c49604872514 Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08002From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 5 Jun 2018 11:11:10 -0300
Brad Bishop19323692019-04-05 15:28:33 -04004Subject: [PATCH 3/4] Properly get LLVM version when using LLVM Git releases
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08005Organization: O.S. Systems Software LTDA.
6
7$ llvm-config-host --version
85.0.0git-9a5c333388c
9
10We need to ignore everything after 5.0.0 which is what the cut cmd is
11doing
12
13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Brad Bishop19323692019-04-05 15:28:33 -040016Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080017---
18 configure.ac | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21diff --git a/configure.ac b/configure.ac
Brad Bishop19323692019-04-05 15:28:33 -040022index 1816a4cd475..13fed9daf59 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080023--- a/configure.ac
24+++ b/configure.ac
Brad Bishop19323692019-04-05 15:28:33 -040025@@ -1124,7 +1124,7 @@ strip_unwanted_llvm_flags() {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080026
27 llvm_set_environment_variables() {
28 if test "x$LLVM_CONFIG" != xno; then
29- LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'`
30+ LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5`
31 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
32 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
33 LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
Brad Bishop19323692019-04-05 15:28:33 -040034@@ -2870,7 +2870,7 @@ detect_old_buggy_llvm() {
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080035 dnl ourselves.
36 dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
37 dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
38- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
39+ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5`
40 AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
41
42 if test "x$llvm_have_one_so" = xyes; then
43--
Brad Bishop19323692019-04-05 15:28:33 -0400442.21.0
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080045