svn commit: r326927 - head/stand

[Warner Losh]

Author: imp
Date: Mon Dec 18 04:51:45 2017
New Revision: 326927
URL: https://svnweb.freebsd.org/changeset/base/326927

Log:
  libficl is only ever used in a loader (never a boot) program. Move it
  to loader.mk.
  
  Sponsored by: Netflix

Modified:
  head/stand/defs.mk
  head/stand/loader.mk

Modified: head/stand/defs.mk
==============================================================================
--- head/stand/defs.mk	Mon Dec 18 04:51:34 2017	(r326926)
+++ head/stand/defs.mk	Mon Dec 18 04:51:45 2017	(r326927)
@@ -24,15 +24,6 @@ BOOTOBJ=	${OBJTOP}/stand
 # BINDIR is where we install
 BINDIR?=	/boot
 
-# NB: The makefiles depend on these being empty when we don't build forth.
-.if ${MK_FORTH} != "no"
-LIBFICL=	${BOOTOBJ}/ficl/libficl.a
-.if ${MACHINE} == "i386"
-LIBFICL32=	${LIBFICL}
-.else
-LIBFICL32=	${BOOTOBJ}/ficl32/libficl.a
-.endif
-.endif
 LIBSA=		${BOOTOBJ}/libsa/libsa.a
 .if ${MACHINE} == "i386"
 LIBSA32=	${LIBSA}

Modified: head/stand/loader.mk
==============================================================================
--- head/stand/loader.mk	Mon Dec 18 04:51:34 2017	(r326926)
+++ head/stand/loader.mk	Mon Dec 18 04:51:45 2017	(r326927)
@@ -129,6 +129,16 @@ LIBZFSBOOT=	${BOOTOBJ}/zfs/libzfsboot.a
 .endif
 .endif
 
+# NB: The makefiles depend on these being empty when we don't build forth.
+.if ${MK_FORTH} != "no"
+LIBFICL=	${BOOTOBJ}/ficl/libficl.a
+.if ${MACHINE} == "i386"
+LIBFICL32=	${LIBFICL}
+.else
+LIBFICL32=	${BOOTOBJ}/ficl32/libficl.a
+.endif
+.endif
+
 CLEANFILES+=	vers.c
 VERSION_FILE?=	${.CURDIR}/version
 .if ${MK_REPRODUCIBLE_BUILD} != no