Changeset 88126 in vbox

Timestamp:

Mar 15, 2021 7:04:53 PM (4 years ago)

Author:

vboxsync

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

143271

Message:

libs/xpcom18a4/Makefile.kmk: Use the same "put libSDL late in the link command line" logic for Solaris as with Linux since this is most flexible, handling static libraries.

tools/Makefile.kmk: Add new libIDL tool for Solaris 11.4 (which no longer ships it as part of the OS).

Location:

trunk

Files:

• src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)
• tools/solaris.amd64 (modified) (1 prop)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -478 +478 @@
  xpidl_CFLAGS = \
         $(libIDL_config_cflags)
- ifeq ($(KBUILD_HOST),linux)
- xpidl_LDFLAGS = \
+ if1of ($(KBUILD_HOST), linux solaris)
+  xpidl_LDFLAGS = \
         $(filter-out -l%,$(libIDL_config_libs))
+  xpidl_LIBS.$(KBUILD_HOST) += \
+        $(subst -l,,$(filter -l%,$(libIDL_config_libs)))
  else
- xpidl_LDFLAGS = \
+  xpidl_LDFLAGS = \
         $(libIDL_config_libs)
  endif
  xpidl_LDFLAGS.linux = \
         $(VBOX_LD_as_needed)
- xpidl_LIBS.linux += \
-        $(subst -l,,$(filter -l%,$(libIDL_config_libs)))
 endif
 

trunk/tools/solaris.amd64

@@ +1 @@
+libIDL
 libSDL
 libsdl

@@ +1 @@
+libIDL
 libSDL
 libsdl

@@ +1 @@
+libIDL
 libSDL
 libsdl