summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <thorsten.behrens@allotropia.de>2022-05-25 13:21:26 +0200
committerAndras Timar <andras.timar@collabora.com>2022-09-09 12:24:44 +0200
commit5eab3ec9c490f95084be5071d895b7111bfd232d (patch)
tree5c340d43b14b1ff70d02bfc3648b82ac0a72b03a
parent3038c8b971940a3ff71a99e6de6cd6aa3c8ecd78 (diff)
Reduce cmd line length for make_installer calls
Seems on Windows, we're hitting the 8k character max cmd line length, on setups with slightly deeper src tree path locations. Shorten length of expanded call_installer calls by putting shell script into PATH locally. Change-Id: If1cddab9e4e07a7c5ebfae7a4e88e43b1bc8b907 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134938 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
-rw-r--r--instsetoo_native/CustomTarget_install.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index f70956fa899d..9ee45b969df8 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -71,8 +71,9 @@ $(if $(GNUPARALLEL), \
, \
$(call gb_Helper_print_on_error, \
cd $(dir $@) \
+ && PATH="$(SRCDIR)/solenv/bin:$$PATH" \
$(foreach curpkg,$(1),\
- && $(SRCDIR)/solenv/bin/call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \
+ && call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \
),$@.log))
endef