LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-07-22 01:09:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to llvm-config --src-root dropped from LLVM 16 trunk

Browse Source 
...with
<c061892fcd>
"[llvm-config] Remove --src-root option", causing

> checking for llvm-config... .../llvm-config
> usage: llvm-config <OPTION>... [<COMPONENT>...]
[...]
> dirname: missing operand
> Try 'dirname --help' for more information.

noise during configure

Change-Id: I0051dd523a3f4cebfdd8b14d8f2e83ba9e5e959b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142362
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2022-11-06 21:51:40 +01:00
parent b60705c95b
commit 08bb758b15
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -8403,9 +8403,11 @@ if test "$COM_IS_CLANG" = "TRUE"; then
fi
# Try if clang is built from source (in which case its includes are not together with llvm includes).
# src-root is [llvm-toplevel-src-dir]/llvm, clang is [llvm-toplevel-src-dir]/clang
clangsrcdir=$(dirname $($LLVM_CONFIG --src-root))
if test -n "$clangsrcdir" -a -d "$clangsrcdir" -a -d "$clangsrcdir/clang/include"; then
COMPILER_PLUGINS_CXXFLAGS="$COMPILER_PLUGINS_CXXFLAGS -I$clangsrcdir/clang/include"
if $LLVM_CONFIG --src-root >/dev/null 2>&1; then
clangsrcdir=$(dirname $($LLVM_CONFIG --src-root))
if test -n "$clangsrcdir" -a -d "$clangsrcdir" -a -d "$clangsrcdir/clang/include"; then
COMPILER_PLUGINS_CXXFLAGS="$COMPILER_PLUGINS_CXXFLAGS -I$clangsrcdir/clang/include"
fi
fi
# obj-root is [llvm-toplevel-obj-dir]/, clang is [llvm-toplevel-obj-dir]/tools/clang
clangobjdir=$($LLVM_CONFIG --obj-root)