Changeset 27140 in vbox for trunk

Timestamp:

Mar 7, 2010 12:43:51 AM (15 years ago)

Author:

vboxsync

Message:

Config.kmk,xpcom18a4/Makefile.kmk: Merged VBOX_WITH_ORIGIN into VBOX_WITH_RELATIVE_RUNPATH.

Location:

trunk

Files:

• Config.kmk (modified) (9 diffs)
• src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1615 +1615 @@
 #
 # Macro switching between @executable_path, @rpath and /Applications/VirtualBox.app
-# depending on whether the build is hardened or not (dylib install_name)
+# depending on whether the build is hardened or not (dylib install_name).
 #
 ifndef VBOX_DYLD_EXECUTABLE_PATH
@@ -1642 +1642 @@
 if defined(VBOX_WITH_RELATIVE_RUNPATH) && defined(VBOX_WITH_HARDENING)
  $(error VBOX_WITH_RELATIVE_RUNPATH and VBOX_WITH_HARDENING are mutually exclusive)
+endif
+
+#
+# VBOX_WITH_ORIGIN translates into VBOX_WITH_RELATIVE_RUNPATH.
+#
+# We use two helper variables for the VBOX_WITH_ORIGIN stuff:
+#       VBOX_ORIGIN - Indirect expansion trick.
+#       VBOX_GCC_RPATH_OPT - Different GCC/LD combinations needs different options.
+#
+VBOX_ORIGIN = $$ORIGIN
+ifeq ($(KBUILD_TARGET),solaris)
+ VBOX_GCC_RPATH_OPT  = -R
+else
+ VBOX_GCC_RPATH_OPT  = -Wl,-rpath,
+ VBOX_GCC_ORIGIN_OPT = -Wl,-z,origin
+endif
+ifdef VBOX_WITH_ORIGIN
+ VBOX_WITH_RELATIVE_RUNPATH = $$(VBOX_ORIGIN)
 endif
 
@@ -1703 +1721 @@
  SDK_DARWIN-OPENGL_ORDERDEPS = $(addprefix $(PATH_OUT)/obj/VBoxOGL/GL/./,$(VBOX_DARWIN_OPENGL_HEADERS))
  ## @todo kBuild: Using INTERMEDIATES doesn't work!
-endif
-
-# Two helper variables for the VBOX_WITH_ORIGIN stuff:
-#       VBOX_ORIGIN - Indirect expansion trick.
-#       VBOX_GCC_RPATH_OPT - Different GCC/LD combinations needs different options.
-## @todo combine ORIGIN with VBOX_WITH_RELATIVE_RUNPATH, it's the same concept.
-VBOX_ORIGIN = $$ORIGIN
-ifeq ($(KBUILD_TARGET),solaris)
- VBOX_GCC_RPATH_OPT = -R
-else
- VBOX_GCC_RPATH_OPT = -Wl,-rpath,
- VBOX_GCC_ORIGIN_OPT = -Wl,-z,origin
 endif
 
@@ -2711 +2717 @@
  else ifdef VBOX_WITH_RELATIVE_RUNPATH
   TEMPLATE_VBOXR3EXE_LDFLAGS          += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
- else ifdef VBOX_WITH_ORIGIN
-  TEMPLATE_VBOXR3EXE_LDFLAGS          += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
+ endif
+ ifdef VBOX_WITH_ORIGIN
   TEMPLATE_VBOXR3EXE_LDFLAGS.linux    += $(VBOX_GCC_ORIGIN_OPT)
  endif
@@ -2890 +2896 @@
 else ifdef VBOX_WITH_RELATIVE_RUNPATH
  TEMPLATE_VBOXR3TSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_VBOXR3EXE_LDFLAGS)
-else ifdef VBOX_WITH_ORIGIN
- TEMPLATE_VBOXR3TSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/..' $(TEMPLATE_VBOXR3EXE_LDFLAGS)
 endif
 ifeq ($(KBUILD_TARGET),win)
@@ -3124 +3128 @@
  else ifdef VBOX_WITH_RELATIVE_RUNPATH
 TEMPLATE_VBOXMAINEXE_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
- else ifdef VBOX_WITH_ORIGIN
-TEMPLATE_VBOXMAINEXE_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
+ endif
+ ifdef VBOX_WITH_ORIGIN
 TEMPLATE_VBOXMAINEXE_LDFLAGS.linux      += $(VBOX_GCC_ORIGIN_OPT)
  endif
@@ -3196 +3200 @@
   if defined(VBOX_WITH_RELATIVE_RUNPATH) && !defined(VBOX_WITH_HARDENING)
    TEMPLATE_VBOXMAINCOMP_LDFLAGS = -fPIC $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VBOXMAINEXE_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'
-  else if defined(VBOX_WITH_ORIGIN)      && !defined(VBOX_WITH_HARDENING)
-   TEMPLATE_VBOXMAINCOMP_LDFLAGS = -fPIC $(filter-out '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)',$(TEMPLATE_VBOXMAINEXE_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/..'
   else
    TEMPLATE_VBOXMAINCOMP_LDFLAGS = -fPIC $(TEMPLATE_VBOXMAINEXE_LDFLAGS)
@@ -3204 +3206 @@
   ifdef VBOX_WITH_RELATIVE_RUNPATH
    TEMPLATE_VBOXMAINCOMP_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VBOXMAINEXE_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'
-  else ifdef VBOX_WITH_ORIGIN
-   TEMPLATE_VBOXMAINCOMP_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)',$(TEMPLATE_VBOXMAINEXE_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/..'
   endif
  endif
@@ -3443 +3443 @@
   else ifdef VBOX_WITH_RELATIVE_RUNPATH
    TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
-  else ifdef VBOX_WITH_ORIGIN
-   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
   endif
 

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -105 +105 @@
 else ifdef VBOX_WITH_RELATIVE_RUNPATH
 TEMPLATE_XPCOM_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
-else ifdef VBOX_WITH_ORIGIN
-TEMPLATE_XPCOM_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
 endif
 TEMPLATE_XPCOM_LDFLAGS.x86         = -m32