Changeset 98159 in vbox for trunk

Timestamp:

Jan 20, 2023 12:14:52 PM (2 years ago)

Author:

vboxsync

Message:

/Config.kmk: Replaced VBOXR3DLLNOXCPT with VBoxR3Dll as parent template for VBoxR3ExtPack. Since we're also shipping heavy C++ API DLLs, there is no point in keeping this template overly limited any more. bugref:10348

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -6731 +6731 @@
 
 #
-# Same as VBoxR3DllBase but without C++ exceptions.
-#
-TEMPLATE_VBOXR3DLLNOXCPT               = VBox Ring 3 SO/DLLs without C++ exception
-TEMPLATE_VBOXR3DLLNOXCPT_EXTENDS       = VBoxR3DllBase
-ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBOXR3DLLNOXCPT_CFLAGS       = $(filter-out -EH%,$(TEMPLATE_VBoxR3DllBase_CFLAGS)  ) -EHs-
- TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS     = $(filter-out -EH%,$(TEMPLATE_VBoxR3DllBase_CXXFLAGS)) -EHs-
- TEMPLATE_VBOXR3DLLNOXCPT_PCHFLAGS     = $(filter-out -EH%,$(TEMPLATE_VBoxR3DllBase_PCHFLAGS)) -EHs-
-else
- TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS     = $(TEMPLATE_VBoxR3DllBase_CXXFLAGS) -fno-exceptions
- TEMPLATE_VBOXR3DLLNOXCPT_PCHFLAGS     = $(TEMPLATE_VBoxR3DllBase_PCHFLAGS) -fno-exceptions
-endif
-
-#
 # Template for building hardened Ring-3 executables.
 # These shall have no extra runpaths, esp. not origin ones.
@@ -7649 +7635 @@
  TEMPLATE_VBoxR3ExtPack = For the ring-3 context extension pack modules.
  if 1 # Native for now.
-  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXR3DLLNOXCPT
-  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXR3DLLNOXCPT_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3
+  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBoxR3Dll
+  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBoxR3Dll_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3
  else
   TEMPLATE_VBoxR3ExtPack_EXTENDS = VBoxNoCrtGccLib
   TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBoxNoCrtGccLib_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3 IPRT_NO_CRT IN_RING3
-  TEMPLATE_VBoxR3ExtPack_INCS = $(PATH_ROOT)/include/iprt/nocrt $(TEMPLATE_VBOXR3DLLNOXCPT_INCS)
+  TEMPLATE_VBoxR3ExtPack_INCS = $(PATH_ROOT)/include/iprt/nocrt $(TEMPLATE_VBoxR3Dll_INCS)
  endif
  ifneq ($(KBUILD_TARGET),win)
-  TEMPLATE_VBoxR3ExtPack_CXXFLAGS = $(TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS) -fno-rtti
-  TEMPLATE_VBoxR3ExtPack_PCHFLAGS = $(TEMPLATE_VBOXR3DLLNOXCPT_PCHFLAGS) -fno-rtti
+  TEMPLATE_VBoxR3ExtPack_CXXFLAGS = $(TEMPLATE_VBoxR3Dll_CXXFLAGS) -fno-rtti
+  TEMPLATE_VBoxR3ExtPack_PCHFLAGS = $(TEMPLATE_VBoxR3Dll_PCHFLAGS) -fno-rtti
  endif
  TEMPLATE_VBoxR3ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
  ifeq ($(KBUILD_TARGET),linux)
-  TEMPLATE_VBoxR3ExtPack_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
+  TEMPLATE_VBoxR3ExtPack_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBoxR3Dll_LDFLAGS))
  else if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
-   TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
+   TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBoxR3Dll_LDFLAGS))
  endif
  ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS