From patchwork Wed Jul  8 21:26:46 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Roland McGrath <roland@hack.frob.com>
X-Patchwork-Id: 7603
Received: (qmail 81722 invoked by alias); 8 Jul 2015 21:26:49 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 81712 invoked by uid 89); 8 Jul 2015 21:26:49 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00,
	KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2
X-HELO: topped-with-meat.com
MIME-Version: 1.0
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.
Message-Id: <20150708212646.16B742C39FC@topped-with-meat.com>
Date: Wed,  8 Jul 2015 14:26:46 -0700 (PDT)
X-CMAE-Score: 0
X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0
	a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=hOe2yjtxAAAA:8
	a=kj9zAlcOel0A:10 a=AO2vjOv1KqL6n_DPHAAA:9 a=CjuIK1q_8ugA:10

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