mirror of
git://sourceware.org/git/glibc.git
synced 2025-02-17 13:00:43 +08:00
* elf/Makefile (lib-noranlib): Move rule adding deps for ld.so et al
to after `include ../Rules', so $(rtld-installed-name) is defined.
This commit is contained in:
parent
d8c7ef98c1
commit
a89d30d444
@ -1,5 +1,8 @@
|
|||||||
Tue Jun 11 15:09:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
|
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.
|
* string/basename.c (basename): Cast FILENAME to char * for return.
|
||||||
|
|
||||||
* Makerules ($(libdir)/libc.so): Put $(rtld-installed) name between
|
* Makerules ($(libdir)/libc.so): Put $(rtld-installed) name between
|
||||||
|
12
elf/Makefile
12
elf/Makefile
@ -51,11 +51,6 @@ generated = librtld.so dl-allobjs.so
|
|||||||
install-others = $(slibdir)/$(rtld-installed-name)
|
install-others = $(slibdir)/$(rtld-installed-name)
|
||||||
install-bin = ldd
|
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)))
|
ifneq (,$(filter linux% linux,$(config-os)))
|
||||||
extra-objs += linux-compat.so
|
extra-objs += linux-compat.so
|
||||||
install-others += $(slibdir)/ld-linux.so.1
|
install-others += $(slibdir)/ld-linux.so.1
|
||||||
@ -66,6 +61,13 @@ endif
|
|||||||
include ../Rules
|
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.
|
# Command to link into a larger single relocatable object.
|
||||||
reloc-link = $(LINK.o) -nostdlib -nostartfiles -r -o $@
|
reloc-link = $(LINK.o) -nostdlib -nostartfiles -r -o $@
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user