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

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

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

New commits:
commit 85847b1bd7245de246fa419ec686b8bead660497
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Tue Apr 16 13:31:21 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Apr 16 17:08:16 2019 +0200

    link.exe in -LIB mode doesn't understand -debug
    
    Apparently link.exe is a wrapper for either a dynamic linker for .exe
    and .dll files, or for an archiver for .lib files, and the latter
    doesn't know -debug and complains about it.
    
    eeeec33ada5923f made it to be passed to all linking.
    
    Change-Id: Ie4b16536f705987de432fc8e2819467fc5bfb719
    Reviewed-on: https://gerrit.libreoffice.org/70817
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 346c67cd7f7c..b6e79e83120a 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -172,6 +172,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(if $(filter StaticLibrary,$(TARGETTYPE)),-LIB) \
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+		$(if $(T_SYMBOLS),$(if $(filter Executable Library CppunitTest,$(TARGETTYPE)),$(gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO)),) \
 		$(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), -SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION))) \
 		$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
 		$(if $(filter YES,$(PE_X86)), -MACHINE:X86) \
@@ -227,6 +228,9 @@ gb_Windows_PE_TARGETTYPEFLAGS := \
 	-dynamicbase \
 	-manifest
 
+# link.exe in -LIB mode doesn't understand -debug, use it only for EXEs and DLLs
+gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO := -debug
+
 ifeq ($(ENABLE_LTO),TRUE)
 gb_Windows_PE_TARGETTYPEFLAGS += -LTCG
 endif
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index b522f3e76572..3a7bbc6557f6 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -259,7 +259,8 @@ gb_DEBUGINFO_FLAGS := \
 	-FS \
 	-Zi \
 
-gb_LINKER_DEBUGINFO_FLAGS := -debug
+# See gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO
+gb_LINKER_DEBUGINFO_FLAGS :=
 
 gb_COMPILEROPTFLAGS := -O2 -Oy-
 gb_COMPILERNOOPTFLAGS := -Od