instsetoo_native/CustomTarget_install.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit c9d018df610b7bd7d5794231b2ccb0d8090573a6
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Fri May 27 00:45:18 2022 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri May 27 09:33:45 2022 +0200
make_installer: convert Win to Unix path for cygwin
Usual cygwin auto-conversion magic doesn't work for PATH variable,
which requires proper /cygdrive/foo/bar entries.
Change-Id: Ic07ffcdf7cb28c5e5702964c331f337ee811c063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135032
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 37b177ab94c2..e4642c6ed6d2 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -71,7 +71,10 @@ $(if $(GNUPARALLEL), \
, \
$(call gb_Helper_print_on_error, \
cd $(dir $@) \
- && PATH="$(SRCDIR)/solenv/bin:$$PATH" \
+ $(if $(filter WNT,$(OS)), \
+ && PATH="$(shell cygpath -u $(SRCDIR)/solenv/bin):$$PATH" \
+ , \
+ && PATH="$(SRCDIR)/solenv/bin:$$PATH") \
$(foreach curpkg,$(1),\
&& call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \
),$@.log))
