Changeset 54092 in vbox for trunk/src/libs

Timestamp:

Feb 5, 2015 3:53:20 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

98047

Message:

build fix

File:

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

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

@@ -181 +181 @@
 VBoxPython2_6_EXTENDS    = VBoxPythonBase
 VBoxPython2_6_EXTENDS_BY = appending
-VBoxPython2_6_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX106,)
+VBoxPython2_6_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,)
 VBoxPython2_6_INCS       = $(VBOX_PYTHON26_INC)
 VBoxPython2_6_LIBS       = $(VBOX_PYTHON26_LIB)
@@ -189 +189 @@
 VBoxPython2_6_x86_EXTENDS    = VBoxPythonBase_x86
 VBoxPython2_6_x86_EXTENDS_BY = appending
-VBoxPython2_6_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX106,-x86)
+VBoxPython2_6_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,-x86)
 VBoxPython2_6_x86_INCS       = $(VBOX_PYTHON26_INC)
 VBoxPython2_6_x86_LIBS       = $(VBOX_PYTHON26_LIB_X86)
@@ -202 +202 @@
 VBoxPython2_7_EXTENDS    = VBoxPythonBase
 VBoxPython2_7_EXTENDS_BY = appending
-VBoxPython2_7_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX107,)
+VBoxPython2_7_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7",OSX107,)
 VBoxPython2_7_INCS       = $(VBOX_PYTHON27_INC)
 VBoxPython2_7_LIBS       = $(VBOX_PYTHON27_LIB)
@@ -210 +210 @@
 VBoxPython2_7_x86_EXTENDS    = VBoxPythonBase_x86
 VBoxPython2_7_x86_EXTENDS_BY = appending
-VBoxPython2_7_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX107,-x86)
+VBoxPython2_7_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7",OSX107,-x86)
 VBoxPython2_7_x86_INCS       = $(VBOX_PYTHON27_INC)
 VBoxPython2_7_x86_LIBS       = $(VBOX_PYTHON27_LIB_X86)