VirtualBox

Changeset 6988 in vbox


Ignore:
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.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r6980 r6988  
    276276IPRT_WITH_KSTUFF = 1
    277277endif
    278 # Use $ORIGIN and avoid setting LD_LIBRARY_PATH at runtime for Solaris.
    279 VBOX_ORIGIN = $$ORIGIN
    280278# Enable Crossbow support for Solaris.
    281279VBOX_WITH_CROSSBOW = 1
     
    1001999VBOX_PATH_X11_XORG_1_3  = $(VBOX_PATH_X11_ROOT)/1.3
    10021000VBOX_PATH_X11_XORG_1_4  = $(VBOX_PATH_X11_ROOT)/1.4
     1001
     1002#
     1003# Various other variables.
     1004#
     1005
     1006# Use $ORIGIN to avoid having to set LD_LIBRARY_PATH at runtime for Solaris.
     1007# (Similar to the -install_name @executable_path/... on darwin.)
     1008VBOX_ORIGIN = $$ORIGIN
    10031009
    10041010
     
    18971903TEMPLATE_VBOXR3TSTEXE_INST    = $(INST_TESTCASE)
    18981904TEMPLATE_VBOXR3TSTEXE_LIBS    = $(LIB_RUNTIME) $(TEMPLATE_VBOXR3EXE_LIBS)
     1905TEMPLATE_VBOXR3TSTEXE_LDFLAGS.solaris = $(TEMPLATE_VBOXR3EXE_LDFLAGS.solaris) '-R$$(VBOX_ORIGIN)/..'
    18991906ifeq ($(BUILD_TARGET),win)
    19001907 ifdef VBOX_SIGNING_MODE
     
    21152122TEMPLATE_VBOXMAINEXE_DEFS               += _REENTRANT
    21162123TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) rt
    2117 TEMPLATE_VBOXMAINEXE_LDFLAGS            += '-R$$(VBOX_ORIGIN)'
     2124TEMPLATE_VBOXMAINEXE_LDFLAGS.solaris     = '-R$$(VBOX_ORIGIN)'
    21182125 else
    21192126$(warning Warning: VBOX Build: Target $(BUILD_TARGET) is not officially supported!)
     
    21532160endif
    21542161TEMPLATE_VBOXMAINDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINEXE_LDFLAGS.darwin))
    2155 ifeq ($(BUILD_TARGET),solaris)
    2156  TEMPLATE_VBOXMAINDLL_LDFLAGS += '-R$$(VBOX_ORIGIN)/..'
    2157 endif
     2162TEMPLATE_VBOXMAINDLL_LDFLAGS.solaris = $(NO_SUCH_VARIABLE) # Must be set on individual targets.
    21582163
    21592164#
  • trunk/src/VBox/Main/Makefile.kmk

    r6968 r6988  
    2727# Include sub-makefile(s) first if we're doing parallel building.
    2828# This is primarily a hack to try avoid idling all but one cpu when
    29 # building the gigant soap sources. 
     29# building the gigant soap sources.
    3030ifneq ($(KMK_OPTS_JOBS),1)
    3131 ifdef VBOX_WITH_WEBSERVICES
     
    264264        -install_name @executable_path/components/VBoxSVCM.dylib \
    265265        -exported_symbols_list $(PATH_TARGET)/VBoxSVCM.def
     266VBoxSVCM_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)/..'
    266267ifeq ($(BUILD_TARGET),darwin)
    267268VBoxSVCM_ORDERDEPS     += $(PATH_TARGET)/VBoxSVCM.def
     
    330331        -install_name @executable_path/components/VBoxSVCM.dylib \
    331332        -exported_symbols_list $(PATH_TARGET)/VBoxC.def
     333VBoxC_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)/..'
    332334ifdef VBOX_USE_VCC80
    333335 VBoxC_LDFLAGS.win = /MANIFEST
     
    413415        xml/Settings.cpp
    414416VBoxSettings_LDFLAGS.darwin = -install_name @executable_path/$(notdir $(LIB_SETTINGS)) -Wl,-x # no debug info please.
     417VBoxSettings_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)'
    415418
    416419
     
    533536# Include sub-makefile(s) last if we're not doing parallel building.
    534537#
    535 # We do this here so that the webservices ends up last in the target 
    536 # lists. For 100% correctness we must do this after all the main 
     538# We do this here so that the webservices ends up last in the target
     539# lists. For 100% correctness we must do this after all the main
    537540# targets has been fully fleshed out as subheader/footer.kmk will
    538541# process new targets.
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette