aboutsummaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-07-17 19:01:35 +0000
committerRoland McGrath <roland@gnu.org>1996-07-17 19:01:35 +0000
commitec2ac6d5303ac21282d0ab2865f3e00746bedacb (patch)
tree0da1c2091ec5b0b2b2a0f538839c2b3d3e21228c /Makerules
parent4de1d5977c0e63cc7517308bbce9157b7903d757 (diff)
downloadglibc-ec2ac6d5303ac21282d0ab2865f3e00746bedacb.tar
glibc-ec2ac6d5303ac21282d0ab2865f3e00746bedacb.tar.gz
glibc-ec2ac6d5303ac21282d0ab2865f3e00746bedacb.tar.bz2
glibc-ec2ac6d5303ac21282d0ab2865f3e00746bedacb.zip
Wed Jul 17 17:08:48 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* version.h (VERSION): Update to 1.93. * Makerules ($(libdir)/libc.so): Depend on $(common-objpfx)libcrypt.so$(libcrypt.so-version). * crypt/nocrypt.c: New file. * Makefile (subdirs): Add crypt. * crypt/Makefile: New file. * Makerules (soversions.mk): Move this target, include of it, and include of version.mk to ... * Makeconfig: ... here. (soversions.mk): Depend on Makeconfig instead of Makerules. * shlib-versions (*-*-*): Set libcrypt=0. Wed Jul 17 02:43:28 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * shlib-versions (*-*-gnu*): Set libc=0.0 Tue Jul 16 01:52:42 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h: Follow Jul 14 change in sysdeps/i386/dl-machine.h. Tue Jul 16 00:14:07 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/inet/syscalls.list (connect, send): Add underscores to the strong name, not the file name. * csu/initfini.c: More magic. Detect if .end is produced and put it in the output iff the compiler does.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules23
1 files changed, 3 insertions, 20 deletions
diff --git a/Makerules b/Makerules
index 0554f85f98..06be41c35e 100644
--- a/Makerules
+++ b/Makerules
@@ -290,25 +290,6 @@ endif
ifeq (yes,$(build-shared))
-# Process the shlib-versions file, which tells us what shared library
-# version numbers to use when we install shared objects on this system.
--include $(common-objpfx)soversions.mk
-$(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makerules \
- $(common-objpfx)config.make
- sed 's/#.*$$//' $< | while read conf versions; do \
- test -n "$$versions" || continue; \
- case '$(config-machine)-$(config-vendor)-$(config-os)' in $$conf)\
- for v in $$versions; do \
- lib="$${v%%=*}"; if eval "test -z \"\$$vers_lib$$lib\""; then \
- eval vers_lib$${lib}=yes; \
- echo $$lib.so-version=.$${v##$$lib=}; fi; \
- done ;; esac; done > $@T
- mv -f $@T $@
-
-# Get $(version) defined with the release version number.
--include $(common-objpfx)version.mk
-
-
# Pattern rule to build a shared object from an archive of PIC objects.
# This must come after the installation rules so Make doesn't try to
# build shared libraries in place from the installed *_pic.a files.
@@ -603,9 +584,11 @@ ifndef subdir
# the special object libc-syms.so that contains just the dynamic symbol
# table of the shared libc object.
install: $(libdir)/libc.so
+cryptobjdir := $(firstword $(objdir) $(patsubst ../$(subdir),.,$(..)crypt))
$(libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \
$(elfobjdir)/$(rtld-installed-name) \
- $(common-objpfx)libc.a
+ $(common-objpfx)libc.a \
+ $(cryptobjdir)libcrypt.so$(libcrypt.so-version)
(echo '/* Use the shared library, but some functions are only in';\
echo ' the static library, so try that secondarily.'; \
echo ' The dynamic linker defines some functions used by $(<F),';\