summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2012-05-09 08:07:08 +0000
committeravg <avg@FreeBSD.org>2012-05-09 08:07:08 +0000
commitc327cf08105e5fe1e80e276923d558b9f7c8db86 (patch)
tree1a1806a4e7da6d06ff42664c89d85665363fb1ea /sys/boot
parenteff14f3f2c0ff6cd55b6dcc290f61ff21f516173 (diff)
downloadFreeBSD-src-c327cf08105e5fe1e80e276923d558b9f7c8db86.zip
FreeBSD-src-c327cf08105e5fe1e80e276923d558b9f7c8db86.tar.gz
i386 zfsloader: rename LIBZFS to LIBZFSBOOT
... to avoid name clash with the other libzfs MFC after: 1 month
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/loader/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 9128e62..e2f8892 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -20,9 +20,7 @@ LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a
# Set by zfsloader Makefile
.if defined(LOADER_ZFS_SUPPORT)
CFLAGS+= -DLOADER_ZFS_SUPPORT
-LIBZFS= ${.OBJDIR}/../../zfs/libzfsboot.a
-.else
-LIBZFS=
+LIBZFSBOOT= ${.OBJDIR}/../../zfs/libzfsboot.a
.endif
# Enable PXE TFTP or NFS support, not both.
@@ -119,8 +117,8 @@ FILES+= menu.rc
# XXX crt0.o needs to be first for pxeboot(8) to work
OBJS= ${BTXCRT}
-DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
+DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud