From 76a8f5b0be61d8b58242c0e87b89437f54069896 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 18 Dec 2017 04:51:45 +0000 Subject: [PATCH] libficl is only ever used in a loader (never a boot) program. Move it to loader.mk. Sponsored by: Netflix --- stand/defs.mk | 9 --------- stand/loader.mk | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/stand/defs.mk b/stand/defs.mk index 7c93abc2f6b1..8d4be1ee767c 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -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} diff --git a/stand/loader.mk b/stand/loader.mk index b573296cf8a7..4acd9c75f96f 100644 --- a/stand/loader.mk +++ b/stand/loader.mk @@ -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