===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- src/Makefile.cross	2019/05/22 02:31:44	1.101
+++ src/Makefile.cross	2019/10/14 14:32:26	1.102
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.101 2019/05/22 02:31:44 patrick Exp $
+# $OpenBSD: Makefile.cross,v 1.102 2019/10/14 14:32:26 patrick Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -95,6 +95,12 @@
 CXX=g++
 .endif
 
+.if !empty(LLD_ARCH:M${_arch})
+LINKER_VERSION=lld
+.else
+LINKER_VERSION=bfd
+.endif
+
 .if !empty(PIE_ARCH:M${_arch})
 NOPIE_FLAGS=-fno-pie
 NOPIE_LDFLAGS=-nopie
@@ -203,6 +209,7 @@
 	    ${MAKE} -f Makefile.bsd-wrapper all && \
 	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
 	    COMPILER_VERSION=${COMPILER_VERSION} \
+	    LINKER_VERSION=${LINKER_VERSION} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    PIE_DEFAULT=${PIE_DEFAULT} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
@@ -239,6 +246,7 @@
 	(cd ${.CURDIR}/gnu/usr.bin/clang; \
 	    DESTDIR=${CROSSDIR} \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    LINKER_VERSION=${LINKER_VERSION} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    MACHINE_ARCH=${TARGET_ARCH} \
 	    ${MAKE} install)