mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

My Windows clang-cl build still doesn't use LO_CLANG_SHARED_PLUGINS

Browse Source 
...so disable the new configure.ac checks introduced with
ad5cbcf6ba0afdc1d8d7405c2641cce8de4a360b "try to autodetect flags needed to
build Clang plugins" that are only relevant when using LO_CLANG_SHARED_PLUGINS
and would fail miserably for my clang-cl build

Change-Id: I58f7f1f4608f1a615175f0c0d0d98c03c442a36c
Reviewed-on: https://gerrit.libreoffice.org/80477
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2019-10-08 16:28:54 +02:00
parent c262e9f94b
commit ffdd79eda0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compilerplugins/Makefile-clang.mk
View File

@ -37,7 +37,8 @@ endif
# Whether to make plugins use one shared ASTRecursiveVisitor (plugins run faster). # Whether to make plugins use one shared ASTRecursiveVisitor (plugins run faster).
# By default enabled, disable if you work on an affected plugin (re-generating takes time). # By default enabled, disable if you work on an affected plugin (re-generating takes time).
LO_CLANG_SHARED_PLUGINS=1 LO_CLANG_SHARED_PLUGINS=1
#TODO: #TODO: Windows doesn't use LO_CLANG_SHARED_PLUGINS for now, see corresponding TODO comment in
# configure.ac:
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
LO_CLANG_SHARED_PLUGINS= LO_CLANG_SHARED_PLUGINS=
endif endif

4
configure.ac
View File

@ -7041,7 +7041,9 @@ if test "$COM_IS_CLANG" = "TRUE"; then
add_warning "Cannot find Clang headers to build compiler plugins, plugins disabled." add_warning "Cannot find Clang headers to build compiler plugins, plugins disabled."
fi fi
]) ])
if test -n "$COMPILER_PLUGINS"; then dnl TODO: Windows doesn't use LO_CLANG_SHARED_PLUGINS for now, see corresponding TODO
dnl comment in compilerplugins/Makefile-clang.mk:
if test -n "$COMPILER_PLUGINS" && test "$_os" != "WINNT"; then
LDFLAGS="" LDFLAGS=""
AC_MSG_CHECKING([for clang libraries to use]) AC_MSG_CHECKING([for clang libraries to use])
if test -z "$CLANGTOOLLIBS"; then if test -z "$CLANGTOOLLIBS"; then