From ffdd79eda08b7ce4492d33fa265d24c60b88d173 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 8 Oct 2019 16:28:54 +0200 Subject: [PATCH] My Windows clang-cl build still doesn't use LO_CLANG_SHARED_PLUGINS ...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 --- compilerplugins/Makefile-clang.mk | 3 ++- configure.ac | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 0d599dcef59a..eb1ae04d0bf4 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -37,7 +37,8 @@ endif # 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). 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) LO_CLANG_SHARED_PLUGINS= endif diff --git a/configure.ac b/configure.ac index e387e4429f0b..5f3b2e71d2b3 100644 --- a/configure.ac +++ b/configure.ac @@ -7041,7 +7041,9 @@ if test "$COM_IS_CLANG" = "TRUE"; then add_warning "Cannot find Clang headers to build compiler plugins, plugins disabled." 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="" AC_MSG_CHECKING([for clang libraries to use]) if test -z "$CLANGTOOLLIBS"; then