configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4927e8277d0a9740c0d52015bbcb8571081b721c
Author: Michael Stahl <[email protected]>
AuthorDate: Sun Mar 14 11:45:10 2021 +0100
Commit: Michael Stahl <[email protected]>
CommitDate: Mon Mar 15 13:15:03 2021 +0100
configure: fix detection of CLANGDIR
... for values of CXX like "sccache clang++" - take the first word that
contains "clang".
Change-Id: Icb4406fdaad73e593e5d7086bc726f8e1b017acd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112479
Tested-by: Jenkins
Reviewed-by: Michael Stahl <[email protected]>
diff --git a/configure.ac b/configure.ac
index fece7f768759..fe84f7b4e922 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7802,7 +7802,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
dnl The prefix where Clang resides, override to where Clang resides if
dnl using a source build:
if test -z "$CLANGDIR"; then
- CLANGDIR=$(dirname $(dirname $($CXX -print-prog-name=$(basename
$(printf '%s\n' $CXX | head -n 1)))))
+ CLANGDIR=$(dirname $(dirname $($CXX -print-prog-name=$(basename
$(printf '%s\n' $CXX | grep clang | head -n 1)))))
fi
# Assume Clang is self-built, but allow overriding
COMPILER_PLUGINS_CXX to the compiler Clang was built with.
if test -z "$COMPILER_PLUGINS_CXX"; then
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
