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