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

[Noel Grandin (via logerrit)]

 solenv/gbuild/LinkTarget.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ef6d1789e45cc9b3ab8a351d84d98dd81cfd84a0
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Tue Feb 25 12:32:07 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Feb 25 18:05:55 2020 +0100

    fix --enable-mergedlibs build
    
    after my recent additions to the list of libs exceeded Windows
    command line length limit (mostly affecting those people whose
    workspace was under a fairly long folder name)
    
    Change-Id: I4d60e9704db49f0a3f562200b737879fba7ee5a8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89420
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9e14f599b690..c0203c01a959 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -648,8 +648,8 @@ TEMPFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
 	$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \
 	$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 	$(foreach object,$(GENCXXCLROBJECTS),$(call gb_GenCxxClrObject_get_target,$(object))) \
-	$(PCHOBJS)) && \
-$(if $(EXTRAOBJECTLISTS),cat $(EXTRAOBJECTLISTS) >> $${TEMPFILE} && ) \
+	$(PCHOBJS) \
+	$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist)))) && \
 mv $${TEMPFILE} $(1)
 
 endef