Additions

Timestamp:

Apr 6, 2018 3:11:22 PM (7 years ago)

Author:

vboxsync

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

121807

Message:

Revert r121784 and 121788: bugref:9112: Linux Additions: fix building binaries for older Linux user space

File:

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

-              r71694
+              r71708
         supc++ \
         gcc_eh
+# The following is for ensuring binary compatibility for old Linux guests.
+# This has to be in LIBS, so as to be linked in after supc++ and gcc_eh, which
+# depend on the symbols it provides.  Static supc++ and gcc_eh on at least
+# Ubuntu 17.04 contain references to __sprintf_chk and __stack_chk_fail.
+# Furthermore, they contain references to memcpy, which needs to be resolved
+# to memcpy@GLIBC_2.2.5, which we solve in a not-very-satisfactory way with a
+# wrapper.
+ifeq ($(KBUILD_TARGET),linux)
+ifdef VBOX_WITH_OLD_GLIBC_SUPPORT
+ # This has to be in LIBS, so as to be linked in after supc++ and gcc_eh, which
+ # depend on the symbols it provides.  Static supc++ and gcc_eh on at least
+ # Ubuntu 17.04 contain references to __sprintf_chk and __stack_chk_fail.
+ # Furthermore, they contain references to memcpy, which needs to be resolved
+ # to memcpy@GLIBC_2.2.5, which we solve in a not-very-satisfactory way with a
+ # wrapper.
+ ifeq ($(KBUILD_TARGET),linux)
 VBoxClient_LIBS    += \
         $(PATH_ROOT)/src/VBox/Additions/x11/VBoxClient/chk_stubs.c
 VBoxClient_LDFLAGS.amd64 += \
         -Wl,--wrap=memcpy
+ endif
 endif

Note: See TracChangeset for help on using the changeset viewer.