Index: head/Mk/bsd.port.mk =================================================================== --- head/Mk/bsd.port.mk +++ head/Mk/bsd.port.mk @@ -1844,6 +1844,7 @@ .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 Index: head/devel/libds/Makefile =================================================================== --- head/devel/libds/Makefile +++ head/devel/libds/Makefile @@ -14,9 +14,7 @@ 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 \ Index: head/devel/pdcurses/Makefile =================================================================== --- head/devel/pdcurses/Makefile +++ head/devel/pdcurses/Makefile @@ -18,9 +18,7 @@ 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 Index: head/devel/ztcl/Makefile =================================================================== --- head/devel/ztcl/Makefile +++ head/devel/ztcl/Makefile @@ -21,7 +21,6 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_src$//} LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd INFO= ${PORTNAME} ${PORTNAME}-zlib Index: head/irc/eggdrop-devel/Makefile =================================================================== --- head/irc/eggdrop-devel/Makefile +++ head/irc/eggdrop-devel/Makefile @@ -26,7 +26,6 @@ MAKE_JOBS_UNSAFE= yes LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd SUB_FILES= pkg-message Index: head/irc/eggdrop/Makefile =================================================================== --- head/irc/eggdrop/Makefile +++ head/irc/eggdrop/Makefile @@ -22,7 +22,6 @@ --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= * Index: head/irc/evangeline/Makefile =================================================================== --- head/irc/evangeline/Makefile +++ head/irc/evangeline/Makefile @@ -18,9 +18,8 @@ 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 Index: head/java/java3d/Makefile =================================================================== --- head/java/java3d/Makefile +++ head/java/java3d/Makefile @@ -24,7 +24,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} Index: head/lang/myrddin/Makefile =================================================================== --- head/lang/myrddin/Makefile +++ head/lang/myrddin/Makefile @@ -20,9 +20,8 @@ TEST_TARGET= check WRKSRC= ${WRKDIR}/mc -# Myrddin is LLD_UNSAFE: # ld: error: : section sh_addralign is not a power of 2 -BINARY_ALIAS= ld=ld.bfd +LLD_UNSAFE= yes OPTIONS_DEFINE= DEBUG VIM OPTIONS_DEFAULT= VIM Index: head/lang/rexx-imc/Makefile =================================================================== --- head/lang/rexx-imc/Makefile +++ head/lang/rexx-imc/Makefile @@ -25,7 +25,6 @@ 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 \ Index: head/lang/smlnj/Makefile =================================================================== --- head/lang/smlnj/Makefile +++ head/lang/smlnj/Makefile @@ -20,7 +20,6 @@ ONLY_FOR_ARCHS= i386 amd64 LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd NO_WRKSUBDIR= yes Index: head/lang/tclX/Makefile =================================================================== --- head/lang/tclX/Makefile +++ head/lang/tclX/Makefile @@ -25,7 +25,6 @@ ALL_TARGET= binaries libraries INSTALL_TARGET= install-binaries install-libraries LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd .include Index: head/multimedia/harvid/Makefile =================================================================== --- head/multimedia/harvid/Makefile +++ head/multimedia/harvid/Makefile @@ -18,7 +18,6 @@ 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 Index: head/net-im/uTox/Makefile =================================================================== --- head/net-im/uTox/Makefile +++ head/net-im/uTox/Makefile @@ -29,7 +29,6 @@ pkgconfig USE_XORG= x11 xext xrender LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd OPTIONS_DEFINE= DBUS OPTIONS_DEFAULT= DBUS Index: head/net-p2p/monero-cli/Makefile =================================================================== --- head/net-p2p/monero-cli/Makefile +++ head/net-p2p/monero-cli/Makefile @@ -34,7 +34,6 @@ GH_PROJECT= monero CFLAGS+= -D_WANT_SEMUN LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd OPTIONS_DEFINE= DOXYGEN DOXYGEN_BUILD_DEPENDS= dot:graphics/graphviz \ Index: head/sysutils/dupd/Makefile =================================================================== --- head/sysutils/dupd/Makefile +++ head/sysutils/dupd/Makefile @@ -18,7 +18,6 @@ USES= gmake ssl sqlite:3 LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz Index: head/sysutils/installwatch/Makefile =================================================================== --- head/sysutils/installwatch/Makefile +++ head/sysutils/installwatch/Makefile @@ -14,9 +14,7 @@ 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 Index: head/www/mozplugger/Makefile =================================================================== --- head/www/mozplugger/Makefile +++ head/www/mozplugger/Makefile @@ -16,7 +16,6 @@ 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}"