Changeset 64057 in vbox for trunk

Timestamp:

Sep 27, 2016 4:19:14 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

110985

Message:

does not work, at least for VBoxRT which links against libz

Location:

trunk

Files:

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

trunk/Config.kmk ¶

@@ -4553 +4553 @@
 TEMPLATE_VBOXR3EXE_LDFLAGS.sparc32     = -m32
 TEMPLATE_VBOXR3EXE_LDFLAGS.sparc64     = -m64
-TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro -Wl,--no-undefined $(VBOX_LD_as_needed)
+TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
 TEMPLATE_VBOXR3EXE_LDFLAGS.solaris     = -Wl,-z,ignore # same as VBOX_LD_as_needed
 
@@ -5355 +5355 @@
  ifeq ($(KBUILD_TARGET),linux)
 TEMPLATE_VBOXMAINEXE_LIBS                = pthread m rt $(LIB_RUNTIME) dl
-TEMPLATE_VBOXMAINEXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro -Wl,--no-undefined $(VBOX_LD_as_needed)
+TEMPLATE_VBOXMAINEXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
  else ifeq ($(KBUILD_TARGET),os2)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3OMF
@@ -5905 +5905 @@
 
   ifeq ($(KBUILD_TARGET),linux)
-   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,-z,noexecstack,-z,relro -Wl,--no-undefined $(VBOX_LD_as_needed)
+   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
    TEMPLATE_VBOXQTGUIEXE_LIBS += \
      $(VBOX_XCURSOR_LIBS) \
@@ -6293 +6293 @@
  TEMPLATE_VBOXGUESTR3EXE_TOOL    := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -fno-exceptions
- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out -Wl$(COMMA)--no-undefined $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
  ifdef VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE
   ifeq ($(KBUILD_TARGET_ARCH),x86)

trunk/src/libs/xpcom18a4/python/Makefile.kmk ¶

@@ -397 +397 @@
 if "$(KBUILD_TARGET)" == "linux"
  VBoxPython_LIBS        = $(VBoxPythonBase_LIBS)
- VBoxPython_LDFLAGS.linux = -Wl,--unresolved-symbols=ignore-in-object-files
 else
  VBoxPython_LIBS        = $(VBoxPythonBase_LIBS) $(VBOX_PYTHONDEF_LIB)