[Libreoffice-commits] core.git: solenv/gbuild
Peter Foley
pefoley2 at pefoley.com
Tue Sep 23 23:31:28 PDT 2014
solenv/gbuild/PythonTest.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9416f4e8ab5fe9e1006bf8afd0b9d0ed2655a315
Author: Peter Foley <pefoley2 at pefoley.com>
Date: Tue Sep 23 21:55:13 2014 -0400
Make PythonTests depend on the ExternalExecutable
This fixes builds on windows with fully-internal python
where the package is built but the exe isn't in instdir
when building a PythonTest.
Change-Id: Iab1d330a36adf1c849635b990bfe5d31359bec2b
Reviewed-on: https://gerrit.libreoffice.org/11618
Reviewed-by: Matúš Kukan <matus.kukan at collabora.com>
Tested-by: Matúš Kukan <matus.kukan at collabora.com>
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index ce5f5ed..c78a896 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -15,7 +15,7 @@ gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
ifeq ($(OS),MACOSX)
gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target,python3)
else
-gb_PythonTest_DEPS := $(call gb_Package_get_target,python3)
+gb_PythonTest_DEPS := $(call gb_ExternalExecutable_get_dependencies,python)
endif
gb_PythonTest_DEPS += $(if $(filter-out WNT,$(OS)),$(call gb_Package_get_target,python_shell))
else
More information about the Libreoffice-commits
mailing list