Fix some places to use $(LN_S) makefile variable.

This commit is contained in:
Roland McGrath 2015-07-08 14:21:41 -07:00
parent b8a9183617
commit 85ee9a0d19
3 changed files with 7 additions and 3 deletions

View File

@ -1,5 +1,9 @@
2015-07-08 Roland McGrath <roland@hack.frob.com> 2015-07-08 Roland McGrath <roland@hack.frob.com>
* Makerules (do-install-so): Use $(LN_S) rather than explicit 'ln -s'.
* elf/Makefile ($(objpfx)$(rtld-installed-name)): Use $(make-link)
rather than explicit 'ln -s'.
* resolv/rpc/netdb.h: New file. * resolv/rpc/netdb.h: New file.
* resolv/Makefile [sunrpc not in $(subdirs)] (headers): Add it. * resolv/Makefile [sunrpc not in $(subdirs)] (headers): Add it.

View File

@ -1132,7 +1132,8 @@ endif
define do-install-so define do-install-so
$(do-install-program) $(do-install-program)
$(patsubst %,ln -s -f $(@F) $(@D)/$(patsubst %$*.so,%,$(<F))$(libprefix)$*.so,\ $(patsubst %,$(LN_S) -f $(@F) \
$(@D)/$(patsubst %$*.so,%,$(<F))$(libprefix)$*.so,\
$(filter-out %.so,$@)) $(filter-out %.so,$@))
endef endef

View File

@ -377,8 +377,7 @@ ifneq (ld.so,$(rtld-installed-name))
# Make sure ld.so.1 exists in the build directory so we can link # Make sure ld.so.1 exists in the build directory so we can link
# against it. # against it.
$(objpfx)$(rtld-installed-name): $(objpfx)ld.so $(objpfx)$(rtld-installed-name): $(objpfx)ld.so
rm -f $@ $(make-link)
ln -s $(<F) $@
generated += $(rtld-installed-name) generated += $(rtld-installed-name)
endif endif