[Libreoffice-commits] core.git: Branch 'feature/cib_contract935' - desktop/Executable_soffice_bin.mk

[Thorsten Behrens]

 desktop/Executable_soffice_bin.mk |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 1638a4a740e84af7e441dbb3d6c04fb9b3439ce7
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Thu Mar 15 14:42:46 2018 +0100

    soffice.bin: slightly decrease stack-size, especially for 32bit
    
    So especially for 32bit builds, creating many threads easily blows
    virtual address space. Let's be more frugal there.
    
    Change-Id: Ib877cb60a0dc4221b9ef7fd88933d5f3207d9a83

diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
index a314aed72f0f..e20f63caa1ff 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -42,10 +42,20 @@ $(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/officeloader))
 
 ifeq ($(COM),MSC)
 
+ifeq ($(CPUNAME),X86_64)
+
 $(eval $(call gb_Executable_add_ldflags,soffice_bin,\
-    /STACK:100000000 \
+    /STACK:30000000 \
 ))
 
+else
+
+$(eval $(call gb_Executable_add_ldflags,soffice_bin,\
+    /STACK:15000000 \
+))
+
+endif
+
 endif
 
 endif