Changeset 7844 in vbox for trunk/src/libs

Timestamp:

Apr 9, 2008 3:21:24 PM (17 years ago)

Author:

vboxsync

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

29445

Message:

Made the rpath $ORIGIN feature available to everyone (was solaris specific) so developers can drop that annoying LD_LIBRARY_PATH stuff. (Make sure your ld.so groks $ORIGIN and add VBOX_WITH_ORIGIN=1 to LocalConfig.kmk.) Hope solaris still works...

File:

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

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -63 +63 @@
 TEMPLATE_XPCOM_DEFS.os2            = OSTYPE=\"OS/2_4.5\"    OSARCH=\"OS/2\"   XP_OS2 XP_PC OS2=4
 TEMPLATE_XPCOM_DEFS.solaris        = OSTYPE=\"Solaris10\"   OSARCH=\"Solaris\" XP_UNIX=1 XP_SOLARIS=1 HAVE_LIBDL=1 HAVE_SENDFILEV=1 SOLARIS=1 _REENTRANT
+ifdef VBOX_WITH_ORIGIN
+TEMPLATE_XPCOM_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/'
+endif
 TEMPLATE_XPCOM_LDFLAGS.x86         = -m32
 TEMPLATE_XPCOM_LDFLAGS.amd64       = -m64
@@ -68 +71 @@
                                      -fshort-wchar -fno-rtti -fno-exceptions -fpascal-strings \
                                      -framework CoreServices -framework CoreFoundation -framework Foundation -framework AppKit -framework Carbon
-TEMPLATE_XPCOM_LDFLAGS.solaris     += -lsendfile '-R$$(VBOX_ORIGIN)'
-ifeq ($(filter os2 win,$(BUILD_TARGET)),)
+ifn1of ($(BUILD_TARGET), os2 win)
  TEMPLATE_XPCOM_CXXFLAGS          += -fPIC
  TEMPLATE_XPCOM_CFLAGS            += -fPIC
@@ -103 +105 @@
                                      # -Wl,--whole-archive,--no-allow-shlib-undefined
 TEMPLATE_XPCOM_LIBS.l4             = $(VBOX_GCC_LIBGCC)
+TEMPLATE_XPCOM_LIBS.solaris        = sendfile
 TEMPLATE_XPCOM_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst))) \
                                      $(PATH_VBox-xpcom-string)/idl_ts