diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-08-02 17:10:59 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-26 14:01:51 +0200 |
| commit | b87da3e9402c8b56ce2a16213802224f9288de4d (patch) | |
| tree | 3d774aeb4b9948db79400585dee3d62cbfd8503b /filter | |
| parent | f7c5dd5f95bf16862668d3c16718cff0ab5561da (diff) | |
run gperf via wsl in wsl-as-helper case
also split up the gperf commands when generating sw/generated/tokens.cxx
wsl has trouble appending using shell redirects, so use separate targets
and use cat in the final processing step for tokens.cxx
see also https://github.com/microsoft/WSL/issues/4400
Change-Id: Id7a24d060e9be71113ec2827a389d347456f6522
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166338
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/CustomTarget_svg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk index bc980eb48e82..7eb0d6178d52 100644 --- a/filter/CustomTarget_svg.mk +++ b/filter/CustomTarget_svg.mk @@ -39,9 +39,9 @@ $(filter_GEN_svg_Tokens_hxx) : $(filter_GEN_svg_Tokens_gperf) $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1) - $(call gb_Helper_abbreviate_dirs, \ - $(GPERF) --compare-strncmp -C -m 20 --switch=2 --readonly-tables $(filter_GEN_svg_Tokens_gperf) \ - | sed -e '/^#line/d' -e 's/(char\*)0/(char\*)0$(COMMA) 0/g' > $@) + $(call gb_Helper_wsl_path,\ + $(GPERF) --compare-strncmp -C -m 20 --switch=2 --readonly-tables $(filter_GEN_svg_Tokens_gperf)) \ + | sed -e '/^#line/d' -e 's/(char\*)0/(char\*)0, 0/g' > $@ $(filter_GEN_svg_Script_hxx) : \ $(call gb_ExternalExecutable_get_dependencies,python) \ |