[Libreoffice-commits] core.git: solenv/gbuild

[Luboš Luňák (via logerrit)]

 solenv/gbuild/LinkTarget.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dcc175b8589b05f90bd24cd1d0738103c07d6507
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon May 27 13:01:17 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon May 27 16:40:03 2019 +0200

    abort if PCH cannot be used because of CXXFLAGS mismatch
    
    Those should mean an error somewhere, e.g. as in the recent libcmis fix.
    
    Change-Id: Iecb973a8f1d56a1bfa0a0e8a5c923e5598682b94
    Reviewed-on: https://gerrit.libreoffice.org/73029
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f1517e40068a..e1c55969a257 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -273,9 +273,10 @@ ifneq ($(strip $$(PCH_NAME)),)
 ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS)))
 $$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME),$$(PCH_LINKTARGETMAKEFILENAME))
 else
-$$(info No precompiled header available for $$*.cxx .)
+$$(warning No precompiled header available for $$*.cxx .)
 $$(info precompiled header flags : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
 $$(info .           object flags : $$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) $$(DEFS)))
+$$(error   Incorrect precompiled header setup or internal gbuild error.)
 $$@ : PCHFLAGS :=
 endif
 endif