diff mbox

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

Message ID 20150708212646.16B742C39FC@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath July 8, 2015, 9:26 p.m. UTC 
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 mbox

Patch

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