Changeset 30123 in vbox for trunk/src/libs

Timestamp:

Jun 9, 2010 2:00:37 PM (14 years ago)

Author:

vboxsync

Message:

python-OSX: Only build against python 2.5 when we are using the 10.5 SDK and are on x86.

File:

• trunk/src/libs/xpcom18a4/python/Makefile.kmk (modified) (2 diffs)

trunk/src/libs/xpcom18a4/python/Makefile.kmk

@@ -101 +101 @@
 endif
 
-if defined(VBOX_PYTHON25_INC) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" != "darwin.amd64"
+if defined(VBOX_PYTHON25_INC) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.x86" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.5"
 #
 # Python 2.5 version
@@ -108 +108 @@
 VBoxPython2_5_EXTENDS    = VBoxPythonBase
 VBoxPython2_5_EXTENDS_BY = appending
-VBoxPython2_5_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX105,)
+VBoxPython2_5_TEMPLATE   = XPCOM
 VBoxPython2_5_INCS       = $(VBOX_PYTHON25_INC)
 VBoxPython2_5_LIBS       = $(VBOX_PYTHON25_LIB)