instsetoo_native/CustomTarget_install.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 98aab1c9cbb54a82ecc9f55d27019caf96f4ec7b
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Apr 19 16:12:22 2024 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Wed Oct 2 19:42:48 2024 +0200
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+libreoff...@googlemail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174246
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 66098e4e6d6c..5c2bfd4ce462 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 ‧,:,$@),\
$(gb_CustomTarget_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)
