Changeset 5877 in vbox

Timestamp:

Nov 28, 2007 10:01:11 PM (17 years ago)

Author:

vboxsync

Message:

backed out r26366 (rhel3 seems to not have this switch)

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• src/recompiler/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1702 +1702 @@
         -Wl,--export-dynamic,--dynamic-linker=libld-l4.s.so \
         -Wl,--rpath-link,$(L4_LIBDIR)
-TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack,--as-needed
+TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack
  ifeq ($(BUILD_TARGET),linux)
 TEMPLATE_VBOXR3EXE_LIBS                = pthread m rt dl
@@ -1959 +1959 @@
  ifeq ($(BUILD_TARGET),linux)
 TEMPLATE_VBOXMAINEXE_LIBS                = pthread m rt $(LIB_RUNTIME)
-TEMPLATE_VBOXMAINEXE_LDFLAGS.linux       = -Wl,--as-needed
  else ifeq ($(BUILD_TARGET),l4)
 TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
@@ -2147 +2146 @@
  endif
 
- ifeq ($(BUILD_TARGET),linux)
-  TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,--as-needed
- else ifeq ($(BUILD_TARGET),darwin)
+ ifeq ($(BUILD_TARGET),darwin)
   TEMPLATE_VBOXQTGUIEXE_INCS += $(VBOX_PATH_MACOSX_SDK_INCS)
   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -framework Carbon -framework QuickTime -bind_at_load

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -64 +64 @@
 VBoxKeyboard_SOURCES  = \
         src/linux/keyboard-new.c
-VBoxKeyboard_LIBS     = X11
 
 

trunk/src/recompiler/Makefile.kmk

@@ -191 +191 @@
  $(REM_MOD)_LDFLAGS.darwin  = -read_only_relocs suppress -install_name @executable_path/$(REM_MOD).dylib -multiple_defined warning
  $(REM_MOD)_LDFLAGS.l4      = -T$(L4_LIBDIR)/../main_rel.ld -nostdlib -Wl,--no-undefined
- $(REM_MOD)_LDFLAGS.linux   = -Wl,--as-needed
  $(REM_MOD)_LDFLAGS.os2     = -Zomf
  $(REM_MOD)_LDFLAGS.debug   = -g