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

[Stephan Bergmann]

 solenv/gbuild/platform/com_MSC_class.mk |    3 ++-
 solenv/gbuild/platform/com_MSC_defs.mk  |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 89f3f90c4e1136c9fc69b9b4c3c39376ecc027b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 10 16:40:12 2017 +0100

    Fix passing /DEBUG:FASTLINK linker option
    
    ...which needs to be past at the end of the command line, after a /link option.
    Looks like at least MSVC 2015 Update 3 silently ignores the garbage /D option
    -DEBUG:fastlink, while clang-cl complains.
    
    Fixes 96af392ba495383927dc886f13a1f5a5cc46d9c1 "Use /debug:fastlink linker
    option to improve link performance".
    
    Change-Id: Ib679d4ce3ac4a7622ba7b066edbfe1872892137a
    Reviewed-on: https://gerrit.libreoffice.org/35048
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 23bb57e..7c0bbbc 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -57,7 +57,8 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(INCLUDE) \
 		$(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \
 		-c $(3) \
-		-Fo$(1)) $(call gb_create_deps,$(4),$(1),$(3))
+		-Fo$(1)) $(if $(filter $(true),$(gb_SYMBOL)),/link /DEBUG:FASTLINK) \
+		$(call gb_create_deps,$(4),$(1),$(3))
 endef
 
 # PrecompiledHeader class
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index f9b077d..a6b1b32 100755
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -250,7 +250,6 @@ gb_LinkTarget_LDFLAGS += \
 gb_DEBUGINFO_FLAGS := \
 	-FS \
 	-Zi \
-	-DEBUG:fastlink \
 
 gb_DEBUG_CFLAGS :=