solenv/gbuild/CustomTarget.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 6475adeb03962c6c1aa1696e4b96928b9a3286ef Author: Christian Lohmaier <[email protected]> AuthorDate: Tue Aug 27 22:35:12 2024 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Fri Aug 30 15:59:48 2024 +0200 wsl: avoid another case of redirection / piping in high-parallelsim/high load case the issues with piping commands with wsl1 can result in an incomplete file being generated in b87da3e9402c8b56ce2a16213802224f9288de4d a similar problem when appending with wsl was addressed by splitting the targets, but in this case just separating the commands is more straightforward Change-Id: I92cc06bf489b2cb4f8ffd412a91656fb6ca48233 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172482 Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Jenkins diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index e698a895baea..7020f2c45b85 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -84,8 +84,8 @@ define gb_CustomTarget_token_hash $(call gb_CustomTarget_get_target,$(1)) : $(gb_CustomTarget_workdir)/$(1)/$(2) $(gb_CustomTarget_workdir)/$(1)/$(2) : $(gb_CustomTarget_workdir)/$(1)/misc/$(3) $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,GPF,1) - $$(call gb_Helper_wsl_path,$(GPERF) --compare-strncmp --switch=2 --readonly-tables $$<) \ - | sed -e '/^#line/d' -e 's/(char\*)0/(char\*)0, 0/g' > $$@ + $$(call gb_Helper_wsl_path,$(GPERF) --compare-strncmp --switch=2 --readonly-tables $$< [email protected]) \ + && sed -e '/^#line/d' -e 's/(char\*)0/(char\*)0, 0/g' [email protected] > $$@ && rm -f [email protected] endef
