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

[Noel Grandin (via logerrit)]

 solenv/gbuild/platform/com_MSC_class.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 448008d64c643d5a1aa2dc5cccc479efcd709a50
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Mon Jan 20 10:14:04 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jan 20 13:14:29 2020 +0100

    only enable windows incremental linking for debug builds
    
    not necessary for optimised builds
    
    Change-Id: I33e7ff372b8b2fd35d6d45b552aceda36aaeba95
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87054
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 5df38636a706..77fd83a733a6 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -256,10 +256,12 @@ $(if $(call gb_LinkTarget__is_merged,$(1)),\
 	$(call gb_LinkTarget_add_libs,$(call gb_Library_get_linktarget,merged),$(foreach lib,$(2),$(call gb_MSVCRT_subst,$(lib)).lib)))
 endef
 
-# Flags common for PE executables (EXEs and DLLs)
+# Flags common for PE executables (EXEs and DLLs).
+# Enable incremental only when debugging to speed up relinking.
 gb_Windows_PE_TARGETTYPEFLAGS := \
 	-release \
 	-opt:noref \
+	$(if $(filter 0,$(gb_DEBUGLEVEL)), -incremental:no) \
 	$(if $(filter NO,$(LIBRARY_X64)), -safeseh) \
 	-nxcompat \
 	-dynamicbase \