configure.ac |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7a764a792f01a01684b5902b8b8b2115feb992ba
Author:     Hossein <[email protected]>
AuthorDate: Wed Nov 5 09:35:58 2025 +0100
Commit:     Hossein <[email protected]>
CommitDate: Wed Nov 5 10:58:32 2025 +0100

    Fix clang build breakage with multiple clang version installations
    
    On some Linux distros, this command outputs multiple directories:
    
    $($LLVM_CONFIG --version|awk -F. {'print $1'})
    
    Therfore, in this patch, we extract major version first.
    
    Change-Id: I0ed8249880c6d6057c4ada6cd9887d49c690f39a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193447
    Reviewed-by: Hossein <[email protected]>
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <[email protected]>

diff --git a/configure.ac b/configure.ac
index f21ad65d7b97..5cb15dc92acb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9024,8 +9024,9 @@ if test "$COM_IS_CLANG" = "TRUE"; then
             if test -n "$COMPILER_PLUGINS"; 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=$(ls -d $($LLVM_CONFIG 
--libdir)/clang/*/include)
+                        # Extract path to the clang system headers (no idea if 
there's a better way to get it).
+                        CLANGSYSMAJORVERSION=$($LLVM_CONFIG --version|awk -F. 
{'print $1'})
+                        CLANGSYSINCLUDE=$(ls -d $($LLVM_CONFIG 
--libdir)/clang/$CLANGSYSMAJORVERSION*/include)
                     fi
                 fi
             fi

Reply via email to