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

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d0eebe0f1471db6f0b9a472a582f51c8c37753b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Aug 5 15:06:16 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Aug 5 16:28:50 2020 +0200

    Adapt --enable-lto to --without-parallelism
    
    ...which sets PARALLELISM to 0 and thus caused
    
      cc1: error: unrecognized argument to ‘-flto=’ option: ‘0’
    
    at least with recent GCC 11 trunk
    
    Change-Id: Ifcfb6485c1c2efc8ab798686ca7fc2392d2cfc2c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100171
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 11d85608a22d..42d8eefff7fd 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -184,7 +184,7 @@ ifeq ($(COM_IS_CLANG),TRUE)
 gb_LTOFLAGS := -flto
 gb_LTOPLUGINFLAGS := --plugin LLVMgold.so
 else
-gb_LTOFLAGS := -flto=$(PARALLELISM) -fuse-linker-plugin -O2
+gb_LTOFLAGS := -flto$(if $(filter-out 0,$(PARALLELISM)),=$(PARALLELISM)) -fuse-linker-plugin -O2
 endif
 endif