diff options
| author | sbruno <sbruno@FreeBSD.org> | 2014-02-25 18:00:55 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2014-02-25 18:00:55 +0000 |
| commit | 725aa10f4c42136e71e74137951aa0ea2c7eebca (patch) | |
| tree | c2ef5c3ab94fd30d00f176bc2782d8164f91be96 | |
| parent | a73cae56879668d8cb4dd40a95d4a1bfd5df85e9 (diff) | |
| download | FreeBSD-src-725aa10f4c42136e71e74137951aa0ea2c7eebca.zip FreeBSD-src-725aa10f4c42136e71e74137951aa0ea2c7eebca.tar.gz | |
Teach userboot to comply with WITHOUT_CDDL/WITHOUT_ZFS
Apparently, LIBZFS is set to a non-empty string when WITHOUT_CDDL/WITHOUT_ZFS
are set, I think this is a bug, but work around this feature for now.
Reviewed by: grehan
| -rw-r--r-- | sys/boot/userboot/userboot/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/boot/userboot/userboot/Makefile b/sys/boot/userboot/userboot/Makefile index b3bba10..5cce1fd 100644 --- a/sys/boot/userboot/userboot/Makefile +++ b/sys/boot/userboot/userboot/Makefile @@ -51,10 +51,12 @@ LIBFICL= ${.OBJDIR}/../ficl/libficl.a LIBSTAND= ${.OBJDIR}/../libstand/libstand.a .endif +.if ${MK_CDDL} != "no" .if ${MK_ZFS} != "no" CFLAGS+= -DUSERBOOT_ZFS_SUPPORT LIBZFS= ${.OBJDIR}/../zfs/libzfsboot.a .endif +.endif # Always add MI sources .PATH: ${.CURDIR}/../../common |
