aboutsummaryrefslogtreecommitdiff
path: root/stand/efi
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2019-01-05 22:45:20 +0000
committerMatt Macy <mmacy@FreeBSD.org>2019-01-05 22:45:20 +0000
commitfbeb31a26b2571d6df5b035246e2f9094fd0bc4c (patch)
tree8d905750e8e551df02e35fc088787c20249c6566 /stand/efi
parentac102a2a633cdc014a4ffd8f323c004b862fd439 (diff)
downloadsrc-fbeb31a26b2571d6df5b035246e2f9094fd0bc4c.tar.gz
src-fbeb31a26b2571d6df5b035246e2f9094fd0bc4c.zip
MK_ZFS -> {MK_ZFS|MK_LOADER_ZFS}, this is so we can diable userland / kernel
ZFS but keep the boot-loaders when using ZoL port. MFC after: 1 week Reviewed by: rgrimes Differential Revision: https://reviews.freebsd.org/D18739
Notes
Notes: svn path=/head/; revision=342793
Diffstat (limited to 'stand/efi')
-rw-r--r--stand/efi/boot1/Makefile2
-rw-r--r--stand/efi/libefi/Makefile2
-rw-r--r--stand/efi/loader/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile
index 88bbb312970c..721d193df5af 100644
--- a/stand/efi/boot1/Makefile
+++ b/stand/efi/boot1/Makefile
@@ -25,7 +25,7 @@ CWARNFLAGS.zfs_module.c += -Wno-unused-function
# architecture-specific loader code
SRCS= boot1.c self_reloc.c start.S ufs_module.c
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
SRCS+= zfs_module.c
CFLAGS.zfs_module.c+= -I${ZFSSRC}
CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/boot/zfs
diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile
index f45f3a70155e..9b0330815900 100644
--- a/stand/efi/libefi/Makefile
+++ b/stand/efi/libefi/Makefile
@@ -44,7 +44,7 @@ CFLAGS+= -fPIC -mno-red-zone
.endif
CFLAGS+= -I${EFIINC}
CFLAGS+= -I${EFIINCMD}
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
CFLAGS+= -I${ZFSSRC}
CFLAGS+= -DEFI_ZFS_BOOT
.endif
diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
index 94c06d01bbfa..58c58533ab2e 100644
--- a/stand/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
@@ -26,7 +26,7 @@ SRCS= autoload.c \
vers.c
CFLAGS+= -I${.CURDIR}/../loader
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
CFLAGS+= -I${ZFSSRC}
CFLAGS+= -DEFI_ZFS_BOOT
HAVE_ZFS= yes