summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2020-01-20 10:14:04 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-01-20 13:14:29 +0100
commit448008d64c643d5a1aa2dc5cccc479efcd709a50 (patch)
tree0c33f8279df37b4b04cf5b0f3f361a179035d698
parent062309078740e2d3ce2d6257d93055dce57a485b (diff)
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@collabora.co.uk>
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk4
1 files changed, 3 insertions, 1 deletions
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 \