diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-05-27 00:45:18 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-09-15 22:31:57 +0200 |
| commit | 314f236ac7e2fecccea3ede760939bcda834ccb7 (patch) | |
| tree | fa95b6cf26dcacd949f60d3a1f2c9934d1c3a17d | |
| parent | 6fe1bf4b636ca8228023270f7e50f1eb14c37c8d (diff) | |
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.behrens@allotropia.de>
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 40c4608c20e5..f712ea74d91f 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)) |