Use BINARY_ALIAS to make LLD_UNSAFE more widely applicable

Some ports do not honour $LD or -fuse-ld=bfd in $CFLAGS, but do invoke
ld via $PATH.   Automatically set BINARY_ALIAS+=ld=${LD} when LLD_UNSAFE
is active to use ld.bfd for these ports.

Approved by:	portmgr (antoine)
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D14876

18 files changed, 6 insertions, 25 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 250e87e78aa7..02ad47c0e288 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1844,6 +1844,7 @@ PKG_DEPENDS+=	${LOCALBASE}/sbin/pkg:${PKG_ORIGIN}
 
 .if defined(LLD_UNSAFE) && ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
 LDFLAGS+=	-fuse-ld=bfd
+BINARY_ALIAS+=	ld=${LD}
 .  if !defined(USE_BINUTILS)
 .    if exists(/usr/bin/ld.bfd)
 LD=	/usr/bin/ld.bfd
diff --git a/devel/libds/Makefile b/devel/libds/Makefile
index b05adbc59689..93a3b1764cb2 100644
--- a/devel/libds/Makefile
+++ b/devel/libds/Makefile
@@ -14,9 +14,7 @@ COMMENT=	ANSI Generic Data Structures Library
 LICENSE=	BSD4CLAUSE
 
 USE_LDCONFIG=	yes
-# Requires directly-invoked linker to provide library search paths.
-LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
+LLD_UNSAFE=	yes	# Needs linker to provide library search paths.
 ALL_TARGET=	gcc
 
 HTML=		avltree.html heap.html parray.html set.html \
diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile
index 082e4ed4d8d1..f5c5208a6d75 100644
--- a/devel/pdcurses/Makefile
+++ b/devel/pdcurses/Makefile
@@ -18,9 +18,7 @@ USE_LDCONFIG=	yes
 USE_XORG=	x11 xext sm ice xt xaw xmu xpm
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
-# Requires directly-invoked linker to provide library search paths.
-LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
+LLD_UNSAFE=	yes	# Needs linker to provide library search paths.
 
 WRKSRC_SUBDIR=	x11
 
diff --git a/devel/ztcl/Makefile b/devel/ztcl/Makefile
index 203a282b56ad..7378d4926a3b 100644
--- a/devel/ztcl/Makefile
+++ b/devel/ztcl/Makefile
@@ -21,7 +21,6 @@ USES=		gmake tcl:tea
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_src$//}
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 INFO=		${PORTNAME} ${PORTNAME}-zlib
 
diff --git a/irc/eggdrop-devel/Makefile b/irc/eggdrop-devel/Makefile
index aa3af1a25330..2585b411b1af 100644
--- a/irc/eggdrop-devel/Makefile
+++ b/irc/eggdrop-devel/Makefile
@@ -26,7 +26,6 @@ GH_TAGNAME=	2bf3950
 
 MAKE_JOBS_UNSAFE=	yes
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 SUB_FILES=	pkg-message
 
diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
index c8bd5354f17d..ff20aa7aae7a 100644
--- a/irc/eggdrop/Makefile
+++ b/irc/eggdrop/Makefile
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \
 		--with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h
 MAKE_JOBS_UNSAFE=	yes
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 SUB_FILES=	pkg-message
 PORTDOCS=	*
diff --git a/irc/evangeline/Makefile b/irc/evangeline/Makefile
index d3c18c6c03e6..f6c47706c703 100644
--- a/irc/evangeline/Makefile
+++ b/irc/evangeline/Makefile
@@ -18,9 +18,8 @@ USES=		gmake tcl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \
 		--with-tclinc=${TCL_INCLUDEDIR}/tcl.h
-# Requires directly-invoked linker to provide library search paths.
+LLD_UNSAFE=	yes	# Needs linker to provide library search paths.
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 PLIST_FILES=	bin/evangeline
 
diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index 282eec2b11bf..7a46814d18b4 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -24,7 +24,6 @@ JAVA_VERSION=	1.6+
 JAVA_VENDOR=	openjdk
 USE_ANT=	yes
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 PLIST_SUB+=	JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH}
 
diff --git a/lang/myrddin/Makefile b/lang/myrddin/Makefile
index a9cf493148db..479de59d3692 100644
--- a/lang/myrddin/Makefile
+++ b/lang/myrddin/Makefile
@@ -20,9 +20,8 @@ CONFIGURE_ARGS=	--prefix "${PREFIX}"
 TEST_TARGET=	check
 WRKSRC=	${WRKDIR}/mc
 
-# Myrddin is LLD_UNSAFE:
 # ld: error: <internal>: section sh_addralign is not a power of 2
-BINARY_ALIAS=	ld=ld.bfd
+LLD_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DEBUG VIM
 OPTIONS_DEFAULT=	VIM
diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index 4824f4e32089..5a036b0fd123 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -25,7 +25,6 @@ CONFIGURE_ARGS=		o all
 NO_BUILD=		yes
 USE_LDCONFIG=		yes
 LLD_UNSAFE=		yes
-BINARY_ALIAS=		ld=ld.bfd
 
 DOCFILES=	rexx.info rexx.ref rexx.summary rexx.tech
 RMEFILES=	README README.Y2K README.bugreport README.docs \
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index 2ac3ddd0af2b..ea993f429158 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -20,7 +20,6 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	i386 amd64
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 NO_WRKSUBDIR=	yes
 
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 4f7935d69c43..a1548f79bab4 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -25,7 +25,6 @@ PLIST_SUB=	TCLX_VER=${PORTVERSION:R}
 ALL_TARGET=	binaries libraries
 INSTALL_TARGET=	install-binaries install-libraries
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 .include <bsd.port.pre.mk>
 
diff --git a/multimedia/harvid/Makefile b/multimedia/harvid/Makefile
index 23a0162dcce3..e839f64bc6f8 100644
--- a/multimedia/harvid/Makefile
+++ b/multimedia/harvid/Makefile
@@ -18,7 +18,6 @@ USES=		gmake jpeg localbase pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	x42
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 MAKE_JOBS_UNSAFE=	yes # https://github.com/x42/harvid/issues/5
 
diff --git a/net-im/uTox/Makefile b/net-im/uTox/Makefile
index 73b5407db79b..cfd6040603fd 100644
--- a/net-im/uTox/Makefile
+++ b/net-im/uTox/Makefile
@@ -29,7 +29,6 @@ USES=		cmake compiler:c11 desktop-file-utils localbase:ldflags openal:al	\
 		pkgconfig
 USE_XORG=	x11 xext xrender
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 OPTIONS_DEFINE=		DBUS
 OPTIONS_DEFAULT=	DBUS
diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile
index e5ec86d46aa1..3ae76b8e22e6 100644
--- a/net-p2p/monero-cli/Makefile
+++ b/net-p2p/monero-cli/Makefile
@@ -34,7 +34,6 @@ GH_ACCOUNT=	monero-project
 GH_PROJECT=	monero
 CFLAGS+=	-D_WANT_SEMUN
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 OPTIONS_DEFINE=		DOXYGEN
 DOXYGEN_BUILD_DEPENDS=	dot:graphics/graphviz \
diff --git a/sysutils/dupd/Makefile b/sysutils/dupd/Makefile
index 665cddd64d98..562d097fcdc4 100644
--- a/sysutils/dupd/Makefile
+++ b/sysutils/dupd/Makefile
@@ -18,7 +18,6 @@ GH_TAGNAME=	v1.4:libbloom
 
 USES=	gmake ssl sqlite:3
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
diff --git a/sysutils/installwatch/Makefile b/sysutils/installwatch/Makefile
index 8aec4351e40b..c9f23f54c745 100644
--- a/sysutils/installwatch/Makefile
+++ b/sysutils/installwatch/Makefile
@@ -14,9 +14,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_LDCONFIG=	yes
-# Requires directly-invoked linker to provide library search paths.
-LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
+LLD_UNSAFE=	yes	# Needs linker to provide library search paths.
 
 PLIST_FILES=	bin/installwatch lib/installwatch.so
 PORTDOCS=	BUGS CHANGELOG README TODO
diff --git a/www/mozplugger/Makefile b/www/mozplugger/Makefile
index 83cc7424e50a..9676a940671b 100644
--- a/www/mozplugger/Makefile
+++ b/www/mozplugger/Makefile
@@ -16,7 +16,6 @@ GNU_CONFIGURE=	yes
 USES=		desthack gmake webplugin:native
 USE_XORG=	x11 xt
 LLD_UNSAFE=	yes
-BINARY_ALIAS=	ld=ld.bfd
 
 WEBPLUGIN_FILES=mozplugger.so
 MAKE_ENV=	WEBPLUGINS_DIR="${WEBPLUGIN_DIR}"