[Libreoffice-commits] core.git: solenv/gbuild

Stephan Bergmann sbergman at redhat.com
Fri Nov 20 05:44:28 PST 2015


 solenv/gbuild/PythonTest.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit de37e7ae4808dc9cdd84a8c21411958ed51db5b6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 20 14:43:11 2015 +0100

    Fix dependency for Mac
    
    ...broken with 4f76e46290b26deeb4f9660c580a5ffef58a557e "make CPPUNITTRACE=TRUE
    a shortcut for debuging on WNT"
    
    Change-Id: Ie6a601da3d4310ea4d43410f8a8e2ddaa16e287d

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index eeff6a0..a65a4a3 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -14,7 +14,7 @@ gb_PythonTest_UNITTESTFAILED ?= $(GBUILDDIR)/platform/unittest-failed-default.sh
 ifeq ($(SYSTEM_PYTHON),)
 gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
 gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
-gb_PythonTest_DEPS ?= $(call gb_Package_get_target,python3) $(call gb_Package_get_target,python_shell)
+gb_PythonTest_DEPS ?= $(if $(filter MACOSX,$(OS)),$(call gb_GeneratedPackage_get_target,python3),$(call gb_Package_get_target,python3)) $(call gb_Package_get_target,python_shell)
 else
 gb_PythonTest_EXECUTABLE := $(PYTHON_FOR_BUILD)
 gb_PythonTest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD)


More information about the Libreoffice-commits mailing list