aboutsummaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-12 22:15:01 +0000
committerRoland McGrath <roland@gnu.org>1996-05-12 22:15:01 +0000
commit0f90ef965036c1b52464ee9491f422eb34a3eaad (patch)
tree35fa95a4a44e0d33c62c40e35ee983c1764bb1df /Makerules
parentaa1075ea2f140dc7b2eec04199935b47111229db (diff)
downloadglibc-0f90ef965036c1b52464ee9491f422eb34a3eaad.zip
glibc-0f90ef965036c1b52464ee9491f422eb34a3eaad.tar.gz
glibc-0f90ef965036c1b52464ee9491f422eb34a3eaad.tar.bz2
* Makerules ($(libdir)/libc.so): Make the file an ld script.cvs/libc-960513
* sysdeps/mach/hurd/configure.in: Don't grok --with-hurd option. * sysdeps/mach/configure.in: File removed. * sysdeps/mach/configure: File removed.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules18
1 files changed, 7 insertions, 11 deletions
diff --git a/Makerules b/Makerules
index 66a5f28..07e4da5 100644
--- a/Makerules
+++ b/Makerules
@@ -577,17 +577,13 @@ ifndef subdir
# the special object libc-syms.so that contains just the dynamic symbol
# table of the shared libc object.
install: $(libdir)/libc.so
-$(libdir)/libc.so: $(common-objpfx)libc-syms.so subdir_install
- $(AR) crvs $@ $< `cat $(addprefix $(common-objpfx)sor-,$(subdirs))`
-
-# Extract from the shared object file just the dynamic symbol table
-# needed to link against the shared library.
-$(common-objpfx)libc-syms.so: $(common-objpfx)libc.so
- AWK='$(AWK)' OBJCOPY='$(OBJCOPY)' OBJDUMP='$(OBJDUMP)' \
- ./extract-dynsym $< $@
-ifndef subdir
-generated += libc-syms.so
-endif
+$(libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \
+ $(common-objpfx)libc.a
+ (echo '/* Use the shared library, but some functions are only in';\
+ echo ' the static library, so try that secondarily. */';\
+ echo 'GROUP ( $(^F) )') > $@.new
+ mv -f $@.new $@
+
endif
else