summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-04-18 17:06:23 +0200
committerDavid Tardon <dtardon@redhat.com>2014-04-18 17:29:50 +0200
commitfbcdc3ec24e107736f4952b3d42504f9f8035b63 (patch)
treefcca8a9d9e6b6bcda0ec33510a08176a048f48eb /solenv
parent1961b699400f09f5ae83dac105a1ba1f6334db53 (diff)
fix deps for PythonTest
System python can be used for build even if the bundled python is enabled, c.f. --enable-python=internal vs. fully-internal. We need to use the python that is used at runtime, not for building. Change-Id: Ia1cd0b787d23645ce469e6975d90f01239256b9b
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/PythonTest.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 23bcd1666f43..24554f283947 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -12,9 +12,15 @@
ifeq ($(SYSTEM_PYTHON),)
gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
+ifeq ($(OS),MACOSX)
+gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target_for_build,python3)
+else
+gb_PythonTest_DEPS := $(call gb_Package_get_target_for_build,python3)
+endif
else
gb_PythonTest_EXECUTABLE := $(PYTHON_FOR_BUILD)
gb_PythonTest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD)
+gb_PythonTest_DEPS :=
endif
gb_PythonTest_COMMAND := $(gb_PythonTest_EXECUTABLE) -m unittest
@@ -29,7 +35,7 @@ ifneq ($(DISABLE_PYTHON),TRUE)
# pass a hard-coded 139 to the gdb postprocess script to match soffice.bin
# signal exit values (assumption: non-0 exit value here means it crashed)
.PHONY : $(call gb_PythonTest_get_target,%)
-$(call gb_PythonTest_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,python)
+$(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
$(call gb_Output_announce,$*,$(true),PYT,2)
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_PythonTest_get_target,$*)) && \