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

Timestamp:

Feb 18, 2008 12:29:53 PM (17 years ago)

Author:

vboxsync

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

28182

Message:

VBOXMAINDLL are used for stuff in different directories, so having ':/..' is potentially unsafe. So, we'll have to set it on each target instead and kill the inherited -R* stuff.

File:

• trunk/src/VBox/Main/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -27 +27 @@
 # Include sub-makefile(s) first if we're doing parallel building.
 # This is primarily a hack to try avoid idling all but one cpu when
-# building the gigant soap sources. 
+# building the gigant soap sources.
 ifneq ($(KMK_OPTS_JOBS),1)
  ifdef VBOX_WITH_WEBSERVICES
@@ -264 +264 @@
         -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
@@ -330 +331 @@
         -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
@@ -413 +415 @@
         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)'
 
 
@@ -533 +536 @@
 # Include sub-makefile(s) last if we're not doing parallel building.
 #
-# We do this here so that the webservices ends up last in the target 
-# lists. For 100% correctness we must do this after all the main 
+# We do this here so that the webservices ends up last in the target
+# lists. For 100% correctness we must do this after all the main
 # targets has been fully fleshed out as subheader/footer.kmk will
 # process new targets.