diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 242c51adf4..c184e5e3dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-11-01 Thomas Schwinge <thomas@codesourcery.com> + * sysdeps/mach/hurd/Makefile (link-libc-static-tests): New + variable. + * elf/dl-support.c: Unconditionally include "setup-vdso.h". * sysdeps/mach/hurd/powerpc: Remove directory. diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index 107eaafb05..ed77903a48 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -167,11 +167,15 @@ $(objpfx)librtld.map: $(rpcuserlibs:.so=_pic.a) CFLAGS-dl-load.c = -DEXTERNAL_MAP_FROM_FD endif -# We need these libs to link static programs in the libc source tree, too. -link-libc-static := -Wl,-\( \ +# Override the generic Makeconfig values so we link against the RPC libs. +link-libc-static := -Wl,--start-group \ $(patsubst %,$(common-objpfx)%.a,\ libc mach/libmachuser hurd/libhurduser) \ - $(static-gnulib) -Wl,-\) + $(static-gnulib) -Wl,--end-group +link-libc-static-tests := -Wl,--start-group \ + $(patsubst %,$(common-objpfx)%.a,\ + libc mach/libmachuser hurd/libhurduser) \ + $(static-gnulib-tests) -Wl,--end-group ifeq ($(subdir),csu) |