summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2024-02-08 14:14:22 +0100
committerAndras Timar <andras.timar@collabora.com>2024-02-09 10:32:13 +0100
commit62caa4586e08b6464396189f1f6e68f57f76bce3 (patch)
treebb2f28ff2e765de83c13ce22ff10501aae1fa13c
parent00127ea86820b1f59d1c25c10a3dee7a545dc07f (diff)
Too big enviroment on Windows can cause failure with xargs distro/mimo/mimo-7-5
Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9
-rw-r--r--CustomTarget_html.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 627623aa2a..fbeee63de3 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -51,7 +51,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 '};' \
) > $@
@@ -275,7 +275,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') \