diff options
| author | Andras Timar <andras.timar@collabora.com> | 2024-02-08 14:14:22 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2024-03-12 16:16:23 +0100 |
| commit | 5dfde9a9192cb30ec373585ff1bfe2121cd6bccf (patch) | |
| tree | 9cd5443fff078ea10d9d4b883ca06616caa61f68 /CustomTarget_html.mk | |
| parent | 04dcd1b951689689f9449408fd6f512a9c87aa0d (diff) | |
Too big environment on Windows can cause failure with xargs
Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163117
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'CustomTarget_html.mk')
| -rw-r--r-- | CustomTarget_html.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index ac3f21956a..a3a9cec55f 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -53,7 +53,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 '};' \ ) > $@ @@ -289,7 +289,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') \ |