From: Roland McGrath <roland@hack.frob.com>
To: "GNU C. Library" <libc-alpha@sourceware.org>
Subject: [COMMITTED PATCH] Fix some places to use $(LN_S) makefile variable.
Date: Wed, 08 Jul 2015 21:26:00 -0000 [thread overview]
Message-ID: <20150708212646.16B742C39FC@topped-with-meat.com> (raw)
Most everything uses $(LN_S) already. This covers the remainder in
makefiles. A caveat is that a lot actually uses scripts/rellns-sh and that
script uses 'ln -s' directly--but the script is skipped when $(LN_S)
doesn't contain '-s', which suffices for the common case of caring about
this (e.g. a Windows cross-host, where one would use LN_S=ln).
Thanks,
Roland
* 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'.
diff --git a/Makerules b/Makerules
index 372b3c0..f9ca3f5 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 bd0f24d..e439527 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
reply other threads:[~2015-07-08 21:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150708212646.16B742C39FC@topped-with-meat.com \
--to=roland@hack.frob.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).