diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-02-25 12:32:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-25 18:05:55 +0100 |
| commit | ef6d1789e45cc9b3ab8a351d84d98dd81cfd84a0 (patch) | |
| tree | b944c175f4b4b84accb739976dc700986a60085a /solenv/gbuild/LinkTarget.mk | |
| parent | bc8488ed715102f08423ce5953727ad8e97fd687 (diff) | |
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@collabora.co.uk>
Diffstat (limited to 'solenv/gbuild/LinkTarget.mk')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 |