Changeset 98179 in vbox

Timestamp:

Jan 21, 2023 10:27:40 PM (2 years ago)

Author:

vboxsync

Message:

xpcom18a4/Config.kmk: s/VBOXR3NP/VBoxR3DllNonPedantic/ bugref:10348

File:

• trunk/src/libs/xpcom18a4/Config.kmk (modified) (5 diffs)

trunk/src/libs/xpcom18a4/Config.kmk

@@ -41 +41 @@
 #
 TEMPLATE_XPCOM                     = XPCOM libraries (shared)
-TEMPLATE_XPCOM_EXTENDS             = VBOXR3NP
-## @todo correct inheritance here to make it use all the VBOXR3NP settings instead of overriding all of them.
-TEMPLATE_XPCOM_ASTOOL              = $(TEMPLATE_VBOXR3NP_TOOL)
+TEMPLATE_XPCOM_EXTENDS             = VBoxR3DllNonPedantic
+## @todo correct inheritance here to make it use all the VBoxR3DllNonPedantic settings instead of overriding all of them.
+TEMPLATE_XPCOM_ASTOOL              = $(TEMPLATE_VBoxR3DllNonPedantic_TOOL)
 TEMPLATE_XPCOM_ASFLAGS             = $(NO_SUCH_VARIABLE)
 TEMPLATE_XPCOM_ASFLAGS.x86         = -m32
@@ -105 +105 @@
 endif
 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
- TEMPLATE_XPCOM_DEFS.darwin        = OSTYPE="Darwin8.8.1" OSARCH="Darwin" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBOXR3NP_DEFS.darwin)
-else
- TEMPLATE_XPCOM_DEFS.darwin        = OSTYPE=\"Darwin8.8.1\" OSARCH=\"Darwin\" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBOXR3NP_DEFS.darwin)
+ TEMPLATE_XPCOM_DEFS.darwin        = OSTYPE="Darwin8.8.1" OSARCH="Darwin" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBoxR3DllNonPedantic_DEFS.darwin)
+else
+ TEMPLATE_XPCOM_DEFS.darwin        = OSTYPE=\"Darwin8.8.1\" OSARCH=\"Darwin\" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBoxR3DllNonPedantic_DEFS.darwin)
 endif
 TEMPLATE_XPCOM_DEFS.darwin.amd64   = VBOX_MACOSX_FOLLOWS_UNIX_IO
@@ -132 +132 @@
  TEMPLATE_XPCOM_DEFS.solaris       = OSTYPE=\"Solaris10\"   OSARCH=\"Solaris\" XP_UNIX=1 XP_SOLARIS=1 HAVE_LIBDL=1 HAVE_SENDFILEV=1 SOLARIS=1 _REENTRANT
 endif
-TEMPLATE_XPCOM_LDFLAGS             = $(TEMPLATE_VBOXR3NP_LDFLAGS)
+TEMPLATE_XPCOM_LDFLAGS             = $(TEMPLATE_VBoxR3DllNonPedantic_LDFLAGS)
 ifdef VBOX_WITH_RUNPATH
 TEMPLATE_XPCOM_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
@@ -141 +141 @@
 TEMPLATE_XPCOM_LDFLAGS.amd64       = -m64
 TEMPLATE_XPCOM_LDFLAGS.arm64       = -m64
-TEMPLATE_XPCOM_LDFLAGS.darwin      = $(TEMPLATE_VBOXR3NP_LDFLAGS.darwin) \
+TEMPLATE_XPCOM_LDFLAGS.darwin      = $(TEMPLATE_VBoxR3DllNonPedantic_LDFLAGS.darwin) \
         -fshort-wchar -fno-rtti -fno-exceptions -fpascal-strings \
         -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
@@ -209 +209 @@
 TEMPLATE_XPCOMYASM = XPCOM w/ yasm
 TEMPLATE_XPCOMYASM_EXTENDS = XPCOM
-TEMPLATE_XPCOMYASM_ASTOOL        = $(TEMPLATE_VBOXR3NP_ASTOOL)
-TEMPLATE_XPCOMYASM_ASFLAGS       = $(TEMPLATE_VBOXR3NP_ASFLAGS)
-TEMPLATE_XPCOMYASM_ASFLAGS.x86   = $(TEMPLATE_VBOXR3NP_ASFLAGS.x86)
-TEMPLATE_XPCOMYASM_ASFLAGS.amd64 = $(TEMPLATE_VBOXR3NP_ASFLAGS.amd64)
-TEMPLATE_XPCOMYASM_ASDEFS        = $(TEMPLATE_VBOXR3NP_DEFS)
+TEMPLATE_XPCOMYASM_ASTOOL        = $(TEMPLATE_VBoxR3DllNonPedantic_ASTOOL)
+TEMPLATE_XPCOMYASM_ASFLAGS       = $(TEMPLATE_VBoxR3DllNonPedantic_ASFLAGS)
+TEMPLATE_XPCOMYASM_ASFLAGS.x86   = $(TEMPLATE_VBoxR3DllNonPedantic_ASFLAGS.x86)
+TEMPLATE_XPCOMYASM_ASFLAGS.amd64 = $(TEMPLATE_VBoxR3DllNonPedantic_ASFLAGS.amd64)
+TEMPLATE_XPCOMYASM_ASDEFS        = $(TEMPLATE_VBoxR3DllNonPedantic_DEFS)