solenv/gbuild/platform/com_MSC_class.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 532ffb7a297d55b495141ce33692df5d9917b54f
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Wed Mar 4 16:11:51 2020 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Mar 23 14:31:19 2020 +0100
do not reset PATH when invoking internal python
Change-Id: I7759fefbf5c2dbc39ae9a53f7c044bf63165608c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90116
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 66333804ab51..19a7198bdbe6 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -674,7 +674,7 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
# Python
-gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program)"
PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)"
PYTHONPATH="$${PYPATH:+$$PYPATH:}$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
+gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program):$$PATH"
PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)"
PYTHONPATH="$${PYPATH:+$$PYPATH:}$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe
gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w
$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
