From c7fd2f4783d87f29f89709e11dc613b0cb04f0dc Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 23 Jul 1996 22:18:45 +0000 Subject: Tue Jul 23 18:13:37 1996 Roland McGrath * sysdeps/mach/hurd/Makefile (rpcuserlibs): New variable. ($(common-objpfx)libc.so): Move deps into that, use it. [$(subdir) = elf] ($(objpfx)librtld.so): Depend on $(rpcuserlibs:.so=_pic.a). * elf/Makefile ($(objpfx)librtld.so): Just depend on libc_pic.a; don't use $(LDLIBS-c.so). Thu Jul 18 21:41:25 1996 Andreas Schwab * sysdeps/generic/stpncpy.c: Fix semantics to make `stpncpy (d, s, n)' equivalent to `strncpy (d, s, n), d += strnlen (d, n)'. --- sysdeps/mach/hurd/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index 8b70092f5f..26446951cc 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -104,11 +104,19 @@ endif # For the shared library, we don't need to do the linker script machination. # Instead, we specify the required libraries when building the shared object. -$(common-objpfx)libc.so: $(firstword $(objdir) $(..)mach)/libmachuser.so \ - $(firstword $(objdir) $(..)hurd)/libhurduser.so +rpcuserlibs := $(firstword $(objdir) $(..)mach)/libmachuser.so \ + $(firstword $(objdir) $(..)hurd)/libhurduser.so +$(common-objpfx)libc.so: $(rpcuserlibs) ifndef objpfx rpath-link += $(..)mach:$(..)hurd endif + +# The RPC stubs from these libraries are needed in building the dynamic +# linker, too. It must be self-contained, so we link the needed PIC +# objects directly into the shared object. +ifeq (elf,$(subdir)) +$(objpfx)librtld.so: $(rpcuserlibs:.so=_pic.a) +endif endif # in-Makerules -- cgit 1.4.1