Changeset 17169 in vbox

Timestamp:

Feb 26, 2009 2:43:12 PM (16 years ago)

Author:

vboxsync

Message:

build fix

File:

• trunk/Config.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -1513 +1513 @@
 else
  VBOX_GCC_RPATH_OPT = -Wl,-rpath,
+ VBOX_GCC_ORIGIN_OPT = -Wl,-z,origin
 endif
 
@@ -2463 +2464 @@
  else ifdef VBOX_WITH_ORIGIN
   TEMPLATE_VBOXR3EXE_LDFLAGS          += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
-  TEMPLATE_VBOXR3EXE_LDFLAGS.linux    += -Wl,-z,origin
+  TEMPLATE_VBOXR3EXE_LDFLAGS.linux    += $(VBOX_GCC_ORIGIN_OPT)
  endif
 endif
@@ -2526 +2527 @@
  else ifdef VBOX_WITH_ORIGIN
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       := $(filter-out '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)',$(TEMPLATE_VBOXR3EXE_LDFLAGS))
-  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux := $(filter-out -Wl,-z,origin,$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
+  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux := $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
  endif
 endif
@@ -2816 +2817 @@
  else ifdef VBOX_WITH_ORIGIN
 TEMPLATE_VBOXMAINEXE_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
-TEMPLATE_VBOXMAINEXE_LDFLAGS.linux      += -Wl,-z,origin
+TEMPLATE_VBOXMAINEXE_LDFLAGS.linux      += $(VBOX_GCC_ORIGIN_OPT)
  endif