Changeset 85209 in vbox for trunk/src/libs

Timestamp:

Jul 11, 2020 10:38:28 AM (5 years ago)

Author:

vboxsync

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

139185

Message:

xpcom18a4/python: Adjustment for .tbd introduction in 10.11. bugref:9790

File:

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

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

@@ -31 +31 @@
 #
 ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
+ ifn1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.10 10.9 10.8 10.7 10.6 10.5 10.4) ## @todo @bugref{9790}: if $(VBOX_DEF_MACOSX_VERSION_MIN) vge 10.11
+  VBOX_PYTHON_SUFFTBD := .tbd
+ else
+  VBOX_PYTHON_SUFFTBD :=
+ endif
  ifndef VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6
   if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.5 10.4)
@@ -40 +45 @@
   else if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.6 10.7 10.8 10.9 10.10 10.11 10.12) ## @todo @bugref{9790} 2.6 header was dropped in 10.13, so: else if $(VBOX_DEF_MACOSX_VERSION_MIN) vge 10.13
    VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Headers
-   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Python
+   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Python$(VBOX_PYTHON_SUFFTBD)
   endif
   if !defined(VBOX_OSE) || "$(wildcard $(VBOX_PYTHON26_LIB))" != ""
@@ -58 +63 @@
   else
    VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.7/Headers
-   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.7/Python
+   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.7/Python$(VBOX_PYTHON_SUFFTBD)
   endif
   if !defined(VBOX_OSE) || "$(wildcard $(VBOX_PYTHON27_LIB))" != ""