diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-04-16 13:31:21 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-04-16 17:08:16 +0200 |
| commit | 85847b1bd7245de246fa419ec686b8bead660497 (patch) | |
| tree | bc2e45b7dbe6984f54862b35aeebb4556c0ae091 | |
| parent | 734dc3c3343b112291fcef606258fb67012a2972 (diff) | |
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@collabora.com>
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 3 |
2 files changed, 6 insertions, 1 deletions
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 |