CustomTarget_html.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 970907045a2400da7ed6e3d14ef76f7ad3b2d783
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Dec 14 09:51:51 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Dec 14 10:42:16 2022 +0000
Fix prepending xargs to gb_ExternalExecutable_get_command, help part
...as was done in f048f02f505704a76c4f01b4ff3f369e8ed928b5 "hid2file.js
generation: process in batch, not each file one-by-one", causing my build to
fail with
> [XSL] CustomTarget/helpcontent2/help3xsl/hid2file.js
> xargs:
LD_LIBRARY_PATH=/home/sbergman/gcc/trunk/inst/lib64:/home/sbergman/lo/core/instdir/program:/home/sbergman/lo/core/instdir/program:
No such file or directory
Change-Id: I94ea42878de55a887e6955b350997425438bb90e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144154
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 46068e82b0..8db68cf8c1 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -48,7 +48,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
( \
RESPONSEFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),$(foreach
module,$(html_TEXT_MODULES),$(gb_AllLangHelp_$(module)_HELPFILES))) && \
echo 'var hid2fileMap = {' \
- && cd $(SRCDIR) && xargs $(call
gb_ExternalExecutable_get_command,xsltproc) $< <$$RESPONSEFILE || { rm
$$RESPONSEFILE; exit 1 ; } \
+ && cd $(SRCDIR) && $(call
gb_ExternalExecutable_get_command,xsltproc,xargs) $< <$$RESPONSEFILE || { rm
$$RESPONSEFILE; exit 1 ; } \
&& rm "$$RESPONSEFILE" \
&& echo '};' \
) > $@ \
