[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann (via logerrit)]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad85d0503bdce3f4a7f8be3dc571343f5b7afdc6
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Mar 9 11:20:36 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Mar 9 13:07:27 2020 +0100

    Adapt CLANGSYSINCLUDE to Git-based LLVM builds
    
    ...where `llvm-config --version` reports something like "11.0.0git"
    
    Change-Id: I63e03d5b50da72aa58b6bc8d9d5a4a7f95e01492
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90207
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index 79041c595948..d17299ecd23f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7306,7 +7306,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
                 if test -z "$CLANGSYSINCLUDE"; then
                     if test -n "$LLVM_CONFIG"; then
                         # Path to the clang system headers (no idea if there's a better way to get it).
-                        CLANGSYSINCLUDE=$($LLVM_CONFIG --libdir)/clang/$($LLVM_CONFIG --version | sed 's/svn//')/include
+                        CLANGSYSINCLUDE=$($LLVM_CONFIG --libdir)/clang/$($LLVM_CONFIG --version | sed 's/git\|svn//')/include
                     fi
                 fi
             fi