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

[Mike Kaganski (via logerrit)]

 solenv/gbuild/platform/com_MSC_class.mk |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 12cc4ce99b8beaeead8b6d82df8b6421e750e965
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue May 7 16:46:01 2019 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue May 7 20:28:03 2019 +0200

    Win7 is current baseline, so no need to differentiate for 32- vs 64-bit
    
    Also remove special-casing for 64-bit libraries introduced in commit
    92dfaaa0bfd08de58ccf9387c805ade24c04b41b, which is obsolete with 6.01.
    
    Change-Id: Ia5befa99788321292b1a4343c2dbb5d8fbba08c9
    Reviewed-on: https://gerrit.libreoffice.org/71915
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 3bf1bdf1a64d..4d7fb0b5d40e 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -144,11 +144,7 @@ cat $${RESPONSEFILE} | sed 's/ /\n/g' | grep -v '^$$' > $${RESPONSEFILE}.1 && \
 mv $${RESPONSEFILE}.1 $${RESPONSEFILE} &&
 endef
 
-ifeq ($(CPUNAME),X86_64)
-MSC_SUBSYSTEM_VERSION=$(COMMA)5.02
-else
-MSC_SUBSYSTEM_VERSION=$(COMMA)5.01
-endif
+MSC_SUBSYSTEM_VERSION=$(COMMA)6.01
 
 # the sort on the libraries is used to filter out duplicates to keep commandline
 # length in check - otherwise the dupes easily hit the limit when linking mergedlib
@@ -173,7 +169,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(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,$(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) \
 		$(if $(filter YES,$(LIBRARY_X64)), \