diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-19 16:12:22 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-26 14:02:37 +0200 |
| commit | 683d9496bd993c638d7f44af8d03b86b9ed8faaa (patch) | |
| tree | eadcda8c66c1012f56a1754f1c2959e693c9b966 | |
| parent | 84c80da9751c2d89655b0cfdda2f7ad581d1b15e (diff) | |
use strawberry perl for installation packaging in wsl-as-helper case
changing it to git-bash perl can probably be done, but would require
more changes to the path handling in the packaging code
Change-Id: I9a31ee6e9f122a2c167e11f5b4f73b18c5c0fa81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166343
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 4a6d92e1cd00..d3a6ad3a96a9 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -121,6 +121,7 @@ $(instsetoo_installer_targets): $(SRCDIR)/solenv/bin/make_installer.pl \ $(if $(filter %msi‧nostrip,$@),$(gb_Make_JobLimiter) grab) $(call gb_Trace_StartRange,$@,INSTALLER) $(call gb_Helper_print_on_error, \ + $(if $(MSYSTEM),export PERLIO=:unix PERL=$(STRAWBERRY_PERL) &&) \ $(SRCDIR)/solenv/bin/call_installer.sh $(if $(verbose),-verbose,-quiet) $(subst ‧,:,$@),\ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/$(if $(filter en-US$(COMMA)%,$(instsetoo_installer_langs)),$(subst $(instsetoo_installer_langs),multilang,$@),$@).log) $(if $(filter %msi‧nostrip,$@),$(gb_Make_JobLimiter) release) |