Index: head/share/mk/bsd.sys.mk
===================================================================
--- head/share/mk/bsd.sys.mk
+++ head/share/mk/bsd.sys.mk
@@ -226,6 +226,8 @@
 CFLAGS+=	${CFLAGS.${.IMPSRC:T}}
 CXXFLAGS+=	${CXXFLAGS.${.IMPSRC:T}}
 
+LDFLAGS+=	${LDFLAGS.${LINKER_TYPE}}
+
 .if defined(SRCTOP)
 # Prevent rebuilding during install to support read-only objdirs.
 .if ${.TARGETS:M*install*} == ${.TARGETS} && empty(.MAKE.MODE:Mmeta)
Index: head/stand/i386/Makefile.inc
===================================================================
--- head/stand/i386/Makefile.inc
+++ head/stand/i386/Makefile.inc
@@ -2,13 +2,9 @@
 #
 # $FreeBSD$
 
-.sinclude <bsd.linker.mk>
-
 LOADER_ADDRESS?=0x200000
 LDFLAGS+=	-nostdlib
-.if defined(LINKER_TYPE) && ${LINKER_TYPE} == "lld"
-LDFLAGS+=	-Wl,--no-rosegment
-.endif
+LDFLAGS.lld+=	-Wl,--no-rosegment
 
 # BTX components
 BTXDIR=		${BOOTOBJ}/i386/btx