qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1999-03-23 Roland McGrath <roland@baalperazim.frob.com> 

* 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.
This commit is contained in:
Roland McGrath 1999-03-23 18:05:48 +00:00
parent 7aff0002b3
commit 5407f442ec
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
1999-03-23 Roland McGrath <roland@baalperazim.frob.com>
* 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.
1999-03-21 Roland McGrath <roland@baalperazim.frob.com> 1999-03-21 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/mach/hurd/Makefile (subdir_lib): Depend on * sysdeps/mach/hurd/Makefile (subdir_lib): Depend on

14
mach/Machrules
View File

@ -221,13 +221,11 @@ $(interface-library)-routines = $(interface-routines)
extra-libs += $(interface-library) extra-libs += $(interface-library)
extra-libs-others += $(interface-library) extra-libs-others += $(interface-library)
# Avoid -lmachuser requiring -lc, which may not be built yet. If the ifeq (yes,$(build-shared))
# shared object is absent, ld may choose a static library someplace and interface.so = $(interface-library:=.so)
# produce a bogus libmachuser.so.
+preinit = # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
+postinit = $(objpfx)$(interface.so): $(common-objpfx)libc.so
+interp = endif
interface.so = $(interface-library:lib%=%.so)
LDFLAGS-$(interface.so) = -nostdlib -nostartfiles
endif endif

11
sysdeps/mach/hurd/Makefile
View File

@ -133,9 +133,18 @@ endif
rpcuserlibs := $(common-objpfx)mach/libmachuser.so \ rpcuserlibs := $(common-objpfx)mach/libmachuser.so \
$(common-objpfx)hurd/libhurduser.so $(common-objpfx)hurd/libhurduser.so
link-rpcuserlibs := $(rpcuserlibs:%user.so=%user-link.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 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 $(link-rpcuserlibs): %-link.so: %_pic.a
$(build-module) -nostdlib -Wl,-soname=$(*F).so$($(*F).so-version) $(build-module) -nostdlib -Wl,-soname=$(*F).so$($(*F).so-version)