about summary refs log tree commit diff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-11 21:33:17 +0000
committerRoland McGrath <roland@gnu.org>1996-06-11 21:33:17 +0000
commitd8c7ef98c193aa032327efcb7cab081da4025908 (patch)
treee628cc26cb2a392cf71814d5ed57424c241f01cf /Makerules
parent852fc4b91e0c657e02c7d15bc24fbbae066ccae3 (diff)
downloadglibc-d8c7ef98c193aa032327efcb7cab081da4025908.tar.gz
glibc-d8c7ef98c193aa032327efcb7cab081da4025908.tar.xz
glibc-d8c7ef98c193aa032327efcb7cab081da4025908.zip
* string/basename.c (basename): Cast FILENAME to char * for return.
	* Makerules ($(libdir)/libc.so): Put $(rtld-installed) name between
	libc.so and libc.a in the deps.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makerules b/Makerules
index 27053f31e8..ff6adcf9d2 100644
--- a/Makerules
+++ b/Makerules
@@ -595,9 +595,13 @@ ifndef subdir
 # table of the shared libc object.
 install: $(libdir)/libc.so
 $(libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \
+		   $(elfobjdir)/$(rtld-installed-name) \
 		   $(common-objpfx)libc.a
 	(echo '/* Use the shared library, but some functions are only in';\
-	 echo '   the static library, so try that secondarily.  */';\
+	 echo '   the static library, so try that secondarily.'; \
+	 echo '   The dynamic linker defines some functions used by $(<F),';\
+	 echo '	  but ld uses definitions from libc.a before the examining';\
+	 echo '    dependencies of $(<F) to find $(rtld-installed-name).  */';\
 	 echo 'GROUP ( $(^F) )') > $@.new
 	mv -f $@.new $@