[Libreoffice-commits] core.git: 2 commits - solenv/gbuild sw/CppunitTest_sw_rtfexport2.mk sw/CppunitTest_sw_rtfexport3.mk sw/CppunitTest_sw_rtfexport4.mk sw/CppunitTest_sw_rtfexport5.mk sw/CppunitTest_sw_rtfexport.mk sw/CppunitTest_sw_rtfimport.mk

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

 solenv/gbuild/LinkTarget.mk     |    4 ++--
 sw/CppunitTest_sw_rtfexport.mk  |    6 ------
 sw/CppunitTest_sw_rtfexport2.mk |    6 ------
 sw/CppunitTest_sw_rtfexport3.mk |    6 ------
 sw/CppunitTest_sw_rtfexport4.mk |    6 ------
 sw/CppunitTest_sw_rtfexport5.mk |    6 ------
 sw/CppunitTest_sw_rtfimport.mk  |    6 ------
 7 files changed, 2 insertions(+), 38 deletions(-)

New commits:
commit c2e0cbee47e807cab77e8011af9800b67cfc0379
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Oct 14 18:56:28 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Oct 14 22:26:49 2019 +0200

    fix incorrect gb_DISABLE_PCH_REUSE test
    
    Change-Id: Ife41ea7ad19c03b8dca6afe8b15d0f3b752b533b
    Reviewed-on: https://gerrit.libreoffice.org/80789
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e7bf4c5b05cb..695becffd076 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1598,7 +1598,7 @@ endef
 # call gb_LinkTarget_reuse_precompiled_header,linktarget,pchcxxfile,,linktargetmakefilename
 define gb_LinkTarget_reuse_precompiled_header
 ifneq ($(gb_ENABLE_PCH),)
-ifneq ($(gb_DISABLE_PCH_REUSE),)
+ifeq ($(gb_DISABLE_PCH_REUSE),$(false))
 $(call gb_LinkTarget__reuse_precompiled_header_impl,$(1),$(2),$(notdir $(2)),$(4))
 $(call gb_LinkTarget__reuse_precompiled_header_workarounds,$(1),$(2),$(notdir $(2)),$(4))
 endif
@@ -1606,7 +1606,7 @@ endif
 
 endef
 
-# call gb_LinkTarget_use_common_precompiled_header,linktarget,,,
+# call gb_LinkTarget_use_common_precompiled_header,linktarget,,,linktargetmakefilename
 define gb_LinkTarget_use_common_precompiled_header
 ifneq ($(gb_ENABLE_PCH),)
 $(call gb_LinkTarget_reuse_precompiled_header,$(1),pch/inc/pch/precompiled_system,,$(4))
commit 7788e87ce25183c1d6f92a3b972b8dd8c88e58e3
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Oct 14 20:46:22 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Oct 14 22:26:37 2019 +0200

    remove -bigobj usage from sw rtf unittests
    
    They all have been split since the time the flag was added,
    and they seem to be small enough again. And this prevents
    a PCH CXXFLAGS mismatch when using the common PCH.
    
    Change-Id: If51d3969e11bb37777d49fe877671c1313721588
    Reviewed-on: https://gerrit.libreoffice.org/80793
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index 1f60aff43dda..bef73f544f54 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -42,12 +42,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport,\
     $$(INCLUDE) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport,\
-	-bigobj \
-))
-endif
-
 $(eval $(call gb_CppunitTest_use_api,sw_rtfexport,\
 	udkapi \
 	offapi \
diff --git a/sw/CppunitTest_sw_rtfexport2.mk b/sw/CppunitTest_sw_rtfexport2.mk
index a751e90005e1..dae927ea4cbe 100644
--- a/sw/CppunitTest_sw_rtfexport2.mk
+++ b/sw/CppunitTest_sw_rtfexport2.mk
@@ -44,12 +44,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport2,\
     $$(INCLUDE) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport2,\
-    -bigobj \
-))
-endif
-
 $(eval $(call gb_CppunitTest_use_api,sw_rtfexport2,\
 	udkapi \
 	offapi \
diff --git a/sw/CppunitTest_sw_rtfexport3.mk b/sw/CppunitTest_sw_rtfexport3.mk
index da31b2fc4ae8..1ecef65c0290 100644
--- a/sw/CppunitTest_sw_rtfexport3.mk
+++ b/sw/CppunitTest_sw_rtfexport3.mk
@@ -42,12 +42,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport3,\
     $$(INCLUDE) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport3,\
-    -bigobj \
-))
-endif
-
 $(eval $(call gb_CppunitTest_use_api,sw_rtfexport3,\
 	udkapi \
 	offapi \
diff --git a/sw/CppunitTest_sw_rtfexport4.mk b/sw/CppunitTest_sw_rtfexport4.mk
index dcef59633a93..64be61d2ca2f 100644
--- a/sw/CppunitTest_sw_rtfexport4.mk
+++ b/sw/CppunitTest_sw_rtfexport4.mk
@@ -42,12 +42,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport4,\
     $$(INCLUDE) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport4,\
-	-bigobj \
-))
-endif
-
 $(eval $(call gb_CppunitTest_use_api,sw_rtfexport4,\
 	udkapi \
 	offapi \
diff --git a/sw/CppunitTest_sw_rtfexport5.mk b/sw/CppunitTest_sw_rtfexport5.mk
index 36d8537f06b9..82fecf0918f8 100644
--- a/sw/CppunitTest_sw_rtfexport5.mk
+++ b/sw/CppunitTest_sw_rtfexport5.mk
@@ -44,12 +44,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport5,\
     $$(INCLUDE) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport5,\
-    -bigobj \
-))
-endif
-
 $(eval $(call gb_CppunitTest_use_api,sw_rtfexport5,\
 	udkapi \
 	offapi \
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index f17103604d27..50c748ca59e0 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -44,12 +44,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfimport,\
     $$(INCLUDE) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfimport,\
-	-bigobj \
-))
-endif
-
 $(eval $(call gb_CppunitTest_use_api,sw_rtfimport,\
 	udkapi \
 	offapi \