Changeset 6988 in vbox
- Timestamp:
- Feb 18, 2008 12:29:53 PM (17 years ago)
- svn:sync-xref-src-repo-rev:
- 28182
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r6980 r6988 276 276 IPRT_WITH_KSTUFF = 1 277 277 endif 278 # Use $ORIGIN and avoid setting LD_LIBRARY_PATH at runtime for Solaris.279 VBOX_ORIGIN = $$ORIGIN280 278 # Enable Crossbow support for Solaris. 281 279 VBOX_WITH_CROSSBOW = 1 … … 1001 999 VBOX_PATH_X11_XORG_1_3 = $(VBOX_PATH_X11_ROOT)/1.3 1002 1000 VBOX_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.) 1008 VBOX_ORIGIN = $$ORIGIN 1003 1009 1004 1010 … … 1897 1903 TEMPLATE_VBOXR3TSTEXE_INST = $(INST_TESTCASE) 1898 1904 TEMPLATE_VBOXR3TSTEXE_LIBS = $(LIB_RUNTIME) $(TEMPLATE_VBOXR3EXE_LIBS) 1905 TEMPLATE_VBOXR3TSTEXE_LDFLAGS.solaris = $(TEMPLATE_VBOXR3EXE_LDFLAGS.solaris) '-R$$(VBOX_ORIGIN)/..' 1899 1906 ifeq ($(BUILD_TARGET),win) 1900 1907 ifdef VBOX_SIGNING_MODE … … 2115 2122 TEMPLATE_VBOXMAINEXE_DEFS += _REENTRANT 2116 2123 TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) rt 2117 TEMPLATE_VBOXMAINEXE_LDFLAGS += '-R$$(VBOX_ORIGIN)'2124 TEMPLATE_VBOXMAINEXE_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)' 2118 2125 else 2119 2126 $(warning Warning: VBOX Build: Target $(BUILD_TARGET) is not officially supported!) … … 2153 2160 endif 2154 2161 TEMPLATE_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 2162 TEMPLATE_VBOXMAINDLL_LDFLAGS.solaris = $(NO_SUCH_VARIABLE) # Must be set on individual targets. 2158 2163 2159 2164 # -
trunk/src/VBox/Main/Makefile.kmk
r6968 r6988 27 27 # Include sub-makefile(s) first if we're doing parallel building. 28 28 # 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. 30 30 ifneq ($(KMK_OPTS_JOBS),1) 31 31 ifdef VBOX_WITH_WEBSERVICES … … 264 264 -install_name @executable_path/components/VBoxSVCM.dylib \ 265 265 -exported_symbols_list $(PATH_TARGET)/VBoxSVCM.def 266 VBoxSVCM_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)/..' 266 267 ifeq ($(BUILD_TARGET),darwin) 267 268 VBoxSVCM_ORDERDEPS += $(PATH_TARGET)/VBoxSVCM.def … … 330 331 -install_name @executable_path/components/VBoxSVCM.dylib \ 331 332 -exported_symbols_list $(PATH_TARGET)/VBoxC.def 333 VBoxC_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)/..' 332 334 ifdef VBOX_USE_VCC80 333 335 VBoxC_LDFLAGS.win = /MANIFEST … … 413 415 xml/Settings.cpp 414 416 VBoxSettings_LDFLAGS.darwin = -install_name @executable_path/$(notdir $(LIB_SETTINGS)) -Wl,-x # no debug info please. 417 VBoxSettings_LDFLAGS.solaris = '-R$$(VBOX_ORIGIN)' 415 418 416 419 … … 533 536 # Include sub-makefile(s) last if we're not doing parallel building. 534 537 # 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 537 540 # targets has been fully fleshed out as subheader/footer.kmk will 538 541 # process new targets.
Note:
See TracChangeset
for help on using the changeset viewer.