Changeset 86645 in vbox for trunk/src

Timestamp:

Oct 20, 2020 12:16:29 PM (4 years ago)

Author:

vboxsync

Message:

xpcom/python: Fix to previous VBoxPython2.so build config. bugref:9840

File:

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

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

@@ -206 +206 @@
 # Unversioned Python 2.x.
 #
- if defined(VBOX_PYTHON27_INC) || defined(VBOX_PYTHON_26_INC)
+ if defined(VBOX_PYTHON27_INC) || defined(VBOX_PYTHON26_INC)
 DLLS += VBoxPython2
 VBoxPython2_EXTENDS    = VBoxPythonBase
@@ -216 +216 @@
 VBoxPython2_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,)
   endif
-  if defined(VBOX_PYTHON_26_INC)
+  if defined(VBOX_PYTHON26_INC)
 VBoxPython2_INCS       = $(VBOX_PYTHON26_INC)
 VBoxPython2_LIBS       = $(VBOX_PYTHON26_LIB)
@@ -225 +225 @@
  endif
 
- if defined(VBOX_WITH_32_ON_64_MAIN_API) && (defined(VBOX_PYTHON27_LIB_X86) || defined(VBOX_PYTHON_26_INC_X86))
+ if defined(VBOX_WITH_32_ON_64_MAIN_API) && (defined(VBOX_PYTHON27_LIB_X86) || defined(VBOX_PYTHON26_INC_X86))
 DLLS += VBoxPython2_x86
 VBoxPython2_x86_EXTENDS    = VBoxPythonBase_x86
@@ -235 +235 @@
 VBoxPython2_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,-x86)
   endif
-  if defined(VBOX_PYTHON27_LIB_X86)
+  if defined(VBOX_PYTHON26LIB_X86)
 VBoxPython2_x86_INCS       = $(VBOX_PYTHON26_INC)
 VBoxPython2_x86_LIBS       = $(VBOX_PYTHON26_LIB_X86)