diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-12-14 09:42:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-12-14 10:42:00 +0000 |
| commit | 3d117dcc4a705f477c8223978200756ac9f83fe3 (patch) | |
| tree | 8a66b231766396616ebe2216ed1199ef0d392b22 /solenv | |
| parent | fde7a73e5fa733cde679d6c9ac42e5c1f7cc9a94 (diff) | |
Fix prepending xargs to gb_ExternalExecutable_get_command, core part
...as was done in
<https://git.libreoffice.org/help/+/f048f02f505704a76c4f01b4ff3f369e8ed928b5%5E!>
"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: I5a58874aa746de13cfc86b691c11349196092dce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144151
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalExecutable.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk index 7a0fd996dd53..0982dd9b8e7f 100644 --- a/solenv/gbuild/ExternalExecutable.mk +++ b/solenv/gbuild/ExternalExecutable.mk @@ -185,6 +185,7 @@ endef define gb_ExternalExecutable__get_command $(call gb_ExternalExecutale__check_registration,$(1)) $(gb_ExternalExecutable_$(1)_PRECOMMAND) \ + $(2) \ $(call gb_ExternalExecutable__get_internal,$(1)) \ $(call gb_ExternalExecutable__get_executable,$(1)) \ $(gb_ExternalExecutable_$(1)_ARGUMENTS) @@ -196,9 +197,12 @@ endef # LD_LIBRARY_PATH for internally built executables), and icerun wrapper # for limiting the maximum number of processes, if available. # +# $2 is an optional part (like "xargs") to place between the setting of shell variables and the +# command proper. +# # gb_ExternalExecutable_get_command executable define gb_ExternalExecutable_get_command -$(strip $(call gb_ExternalExecutable__get_command,$(1))) +$(strip $(call gb_ExternalExecutable__get_command,$(1),$(2))) endef define gb_ExternalExecutable__get_dependencies |