Changeset 7844 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

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/VBox/Main/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -265 +265 @@
 VBoxSVCM_SOURCES        = \
         linux/server_module.cpp
+ifdef VBOX_WITH_ORIGIN
+VBoxSVCM_LDFLAGS        = '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/..'
+endif
 VBoxSVCM_LDFLAGS.darwin = \
         -install_name @executable_path/components/VBoxSVCM.dylib \
         -exported_symbols_list $(PATH_TARGET)/VBoxSVCM.def
-VBoxSVCM_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)/..'
 ifeq ($(BUILD_TARGET),darwin)
 VBoxSVCM_ORDERDEPS     += $(PATH_TARGET)/VBoxSVCM.def
@@ -332 +334 @@
         $(PATH_SUB_CURRENT)
 
+ifdef VBOX_WITH_ORIGIN
+VBoxC_LDFLAGS        = '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/..'
+endif
 VBoxC_LDFLAGS.darwin = \
         -install_name @executable_path/components/VBoxSVCM.dylib \
         -exported_symbols_list $(PATH_TARGET)/VBoxC.def
-VBoxC_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)/..'
 ifdef VBOX_USE_VCC80
  VBoxC_LDFLAGS.win = /MANIFEST
@@ -419 +423 @@
         xml/Settings.cpp
 VBoxSettings_LDFLAGS.darwin = -install_name @executable_path/$(notdir $(LIB_SETTINGS)) -Wl,-x # no debug info please.
-VBoxSettings_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)'