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. --- mach/Machrules | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'mach/Machrules') diff --git a/mach/Machrules b/mach/Machrules index b5a6998c18..adf539419a 100644 --- a/mach/Machrules +++ b/mach/Machrules @@ -221,13 +221,11 @@ $(interface-library)-routines = $(interface-routines) extra-libs += $(interface-library) extra-libs-others += $(interface-library) -# Avoid -lmachuser requiring -lc, which may not be built yet. If the -# shared object is absent, ld may choose a static library someplace and -# produce a bogus libmachuser.so. -+preinit = -+postinit = -+interp = -interface.so = $(interface-library:lib%=%.so) -LDFLAGS-$(interface.so) = -nostdlib -nostartfiles +ifeq (yes,$(build-shared)) +interface.so = $(interface-library:=.so) + +# Depend on libc.so so a DT_NEEDED is generated in the shared objects. +$(objpfx)$(interface.so): $(common-objpfx)libc.so +endif endif -- cgit v1.2.3