Changeset 106683 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Oct 25, 2024 10:28:28 AM (5 months ago)

Author:

vboxsync

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

165553

Message:

/Config.kmk,*.kmk: Changed the LIBS properties on all templates to LATE_LIBS to help solve library ordering issues. Only tested on win.amd64. jiraref:1253

Location:

trunk/src/libs/xpcom18a4

Files:

• Config.kmk (modified) (4 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/src/libs/xpcom18a4/Config.kmk

@@ -165 +165 @@
 
 # When using IPRT in NSRP or/and using IPRT for logging, link with IPRT.
-TEMPLATE_XPComDll_LIBS               += $(LIB_RUNTIME)
+TEMPLATE_XPComDll_LATE_LIBS          += $(LIB_RUNTIME)
 
 
@@ -182 +182 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
         .
-TEMPLATE_XPComExe_LIBS             = \
+TEMPLATE_XPComExe_LATE_LIBS        = \
         $(VBox-xpcom-ipcshared_1_TARGET) \
         $(VBoxXPCOM_1_TARGET) \
-        $(TEMPLATE_XPComDll_LIBS)
-TEMPLATE_XPComExe_LIBS.freebsd     = $(LIB_PTHREAD)
-TEMPLATE_XPComExe_LIBS.linux       = dl $(LIB_PTHREAD)
+        $(TEMPLATE_XPComDll_LATE_LIBS)
+TEMPLATE_XPComExe_LATE_LIBS.freebsd = $(LIB_PTHREAD)
+TEMPLATE_XPComExe_LATE_LIBS.linux  = dl $(LIB_PTHREAD)
 TEMPLATE_XPComExe_LDFLAGS.darwin   = -bind_at_load $(filter-out -current_version -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD),$(TEMPLATE_XPComDll_LDFLAGS.darwin))
 
@@ -233 +233 @@
 TEMPLATE_XPComBldProg_LDFLAGS.darwin     = $(TEMPLATE_VBoxAdvBldProg_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
 TEMPLATE_XPComBldProg_ORDERDEPS          = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))
-TEMPLATE_XPComBldProg_LIBS.darwin        = \
+TEMPLATE_XPComBldProg_LATE_LIBS.darwin   = \
         iconv
 
@@ -255 +255 @@
 TEMPLATE_XPComDll-x86_BLD_TRG_ARCH     = x86
 TEMPLATE_XPComDll-x86_DEFS             = $(TEMPLATE_XPComDll_DEFS) VBOX_IN_32_ON_64_MAIN_API
-TEMPLATE_XPComDll-x86_LIBS             = $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86),$(TEMPLATE_XPComDll_LIBS))
+TEMPLATE_XPComDll-x86_LATE_LIBS        = $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86),$(TEMPLATE_XPComDll_LATE_LIBS))
 
 

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -764 +764 @@
  TEMPLATE_XPComIpcDll_DEFS           += IPC_LOGGING
 endif
-TEMPLATE_XPComIpcDll_LIBS             = $(VBoxXPCOM_1_TARGET) $(TEMPLATE_XPComDll_LIBS)
+TEMPLATE_XPComIpcDll_LATE_LIBS        = $(VBoxXPCOM_1_TARGET) $(TEMPLATE_XPComDll_LATE_LIBS)
 ifneq ($(KBUILD_TARGET),win)
  ifeq ($(filter-out solaris.x86 %.amd64 %.sparc32 %.sparc64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) ## TODO: cleanup!
@@ -780 +780 @@
 TEMPLATE_XPComIpcDll-x86_EXTENDS      = XPComIpcDll
 TEMPLATE_XPComIpcDll-x86_BLD_TRG_ARCH = x86
-TEMPLATE_XPComIpcDll-x86_LIBS         = $(VBoxXPCOM-x86_1_TARGET) $(TEMPLATE_XPComDll-x86_LIBS)
+TEMPLATE_XPComIpcDll-x86_LATE_LIBS    = $(VBoxXPCOM-x86_1_TARGET) $(TEMPLATE_XPComDll-x86_LATE_LIBS)
 
 TEMPLATE_XPComIpcExe               = XPCOM IPC executables
@@ -836 +836 @@
         $(VBox-xpcom-ipcshared_1_TARGET) \
         $(VBoxXPCOM_1_TARGET) \
-        $(TEMPLATE_XPComDll_LIBS)
+        $(TEMPLATE_XPComDll_LATE_LIBS)