* elf/Makefile (lib-noranlib): Move rule adding deps for ld.so et al

	to after `include ../Rules', so $(rtld-installed-name) is defined.

diff --git a/ChangeLog b/ChangeLog
index 720acbbb8f97fe7e6346f0afc425fa17bda68211..4e9f04134680d0e4c702f5407045c1f2a9936506 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Tue Jun 11 15:09:15 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+       * elf/Makefile (lib-noranlib): Move rule adding deps for ld.so et al
+       to after `include ../Rules', so $(rtld-installed-name) is defined.
+
        * string/basename.c (basename): Cast FILENAME to char * for return.
 
        * Makerules ($(libdir)/libc.so): Put $(rtld-installed) name between

diff --git a/elf/Makefile b/elf/Makefile
index 5a550a10a2433b48b4e114bbed4d75f9693cce28..59906a017b0a20484795261458f053712a653ff0 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -51,11 +51,6 @@ generated    = librtld.so dl-allobjs.so
 install-others = $(slibdir)/$(rtld-installed-name)
 install-bin    = ldd
 
-# Make sure these things are built in the `make lib' pass so they can be used
-# to run programs during the `make others' pass.
-lib-noranlib: $(objpfx)$(rtld-installed-name) \
-             $(addprefix $(objpfx),$(extra-objs))
-
 ifneq (,$(filter linux% linux,$(config-os)))
 extra-objs     += linux-compat.so
 install-others += $(slibdir)/ld-linux.so.1
@@ -66,6 +61,13 @@ endif
 include ../Rules
 
 
+ifeq (yes, $(build-shared))
+# Make sure these things are built in the `make lib' pass so they can be used
+# to run programs during the `make others' pass.
+lib-noranlib: $(objpfx)$(rtld-installed-name) \
+             $(addprefix $(objpfx),$(extra-objs))
+endif
+
 # Command to link into a larger single relocatable object.
 reloc-link = $(LINK.o) -nostdlib -nostartfiles -r -o $@