From 5407f442ec52d7aa7a92573b765dafecca74abe4 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 23 Mar 1999 18:05:48 +0000 Subject: 1999-03-23 Roland McGrath * sysdeps/mach/hurd/Makefile: Undo last change. [$(subdir) = mach] (lib-noranlib): Depend on libmachuser-link.so. [$(subdir) = hurd] (lib-noranlib): Depend on libhurduser-link.so. * mach/Machrules (+preinit, +postinit, +interp, LDFLAGS-$(interface.so)): Variables removed. Interface libraries get linked just like other shared libraries. (interface.so): Fix typo in defn, so it works. ($(objpfx)$(interface.so)): Make it depend on libc.so. --- sysdeps/mach/hurd/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'sysdeps/mach/hurd/Makefile') diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index fbc1ad3f61..ec466e3ee6 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -133,9 +133,18 @@ endif rpcuserlibs := $(common-objpfx)mach/libmachuser.so \ $(common-objpfx)hurd/libhurduser.so link-rpcuserlibs := $(rpcuserlibs:%user.so=%user-link.so) -$(common-objpfx)libc.so subdir_lib: $(link-rpcuserlibs) +$(common-objpfx)libc.so: $(link-rpcuserlibs) rpath-dirs += mach hurd +# Make sure the `lib' pass builds the dummy shared objects so +# we can link libc against them. +ifeq (mach,$(subdir)) +lib-noranlib: $(common-objpfx)mach/libmachuser-link.so +endif +ifeq (hurd,$(subdir)) +lib-noranlib: $(common-objpfx)hurd/libhurduser-link.so +endif + $(link-rpcuserlibs): %-link.so: %_pic.a $(build-module) -nostdlib -Wl,-soname=$(*F).so$($(*F).so-version) -- cgit 1.4.1