[Libreoffice-commits] core.git: solenv/Module_solenv.mk

[Stephan Bergmann]

 solenv/Module_solenv.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2228203a8211dea1c8addb98298096a094ec788b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 18 11:51:38 2017 +0200

    Don't run CompilerTest_compilerplugins_clang with COMPILER_PLUGIN_TOOL=...
    
    When COMPILER_PLUGIN_TOOL is set, solenv/gbuild/LinkTarget.mk uses the (plaform-
    generic) gb_*__tool_command which don't know about the COMPILER_TEST flag (as
    gb_CObject__command_pattern in solenv/gbuild/platform/com_GCC_class.mk does), so
    a top-level Clang
    
      make COMPILER_PLUGIN_TOOL=...
    
    will generate spurious warnings from CompilerTest_compilerplugins_clang's
    compilations done without the -Xclang -verify switch.  This solution is a bit
    hacky (e.g., it would be better to handle this more centrally in
    solenv/gbuild/CompilerTest.mk), but effective.
    
    Change-Id: I58e9a76207065d9f6050a1ace6fc85c5a26882f8

diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 528ac897a13a..70eb5f9fb7c3 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -36,9 +36,11 @@ endif
 endif
 
 ifneq ($(COMPILER_PLUGINS),)
+ifeq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
 $(eval $(call gb_Module_add_check_targets,solenv, \
     CompilerTest_compilerplugins_clang \
 ))
 endif
+endif
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab: