CustomTarget_html.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8754781f8e55e17c177e0b5f2d632f7c45842e5b
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Feb 8 14:14:22 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Feb 8 15:15:32 2024 +0100
Too big environment on Windows can cause failure with xargs
Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163141
Tested-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 167c947d97..3caa7163b9 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -52,7 +52,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
( \
RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst
helpcontent2/source/text/,,$(gb_html_allhelpfiles)$(if $(filter WNT,$(OS)), )))
&& \
echo 'var hid2fileMap = {' \
- && cd $(SRCDIR)/helpcontent2/source/text && $(call
gb_ExternalExecutable_get_command,xsltproc,xargs) $< <$$RESPONSEFILE || { rm
$$RESPONSEFILE; exit 1 ; } \
+ && cd $(SRCDIR)/helpcontent2/source/text && $(call
gb_ExternalExecutable_get_command,xsltproc,$(if $(filter WNT,$(OS)),env -i
$(gb_Helper_set_ld_path)) xargs) $< <$$RESPONSEFILE || { rm $$RESPONSEFILE;
exit 1 ; } \
&& rm "$$RESPONSEFILE" \
&& echo '};' \
) > $@
@@ -288,7 +288,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst
helpcontent2/source/text/,,$(gb_AllLangHelp_$(APPDIR)_BOOKMARK_HELPFILES))$(if
$(filter WNT,$(OS)), )) \
&& cd $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call
gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/helpcontent2/source/text \
&& ( \
- $(call gb_ExternalExecutable_get_command,xsltproc,xargs) \
+ $(call gb_ExternalExecutable_get_command,xsltproc,$(if $(filter
WNT,$(OS)),env -i $(gb_Helper_set_ld_path)) xargs) \
--stringparam app $(APP) \
--stringparam Language $(HELP_LANG) \
--stringparam local $(if $(HELP_ONLINE),'no','yes') \
