aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makerules3
-rw-r--r--elf/Makefile3
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c841dafd56..90d5fa016a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
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/Makefile [sunrpc not in $(subdirs)] (headers): Add it.
diff --git a/Makerules b/Makerules
index 372b3c0103..f9ca3f5021 100644
--- a/Makerules
+++ b/Makerules
@@ -1132,7 +1132,8 @@ endif
define do-install-so
$(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,$@))
endef
diff --git a/elf/Makefile b/elf/Makefile
index bd0f24dd51..e439527fb9 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -377,8 +377,7 @@ ifneq (ld.so,$(rtld-installed-name))
# Make sure ld.so.1 exists in the build directory so we can link
# against it.
$(objpfx)$(rtld-installed-name): $(objpfx)ld.so
- rm -f $@
- ln -s $(<F) $@
+ $(make-link)
generated += $(rtld-installed-name)
endif