d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i386 zfsloader: rename LIBZFS to LIBZFSBOOT

Browse Source 
... to avoid name clash with the other libzfs

MFC after:	1 month
This commit is contained in:
avg 2012-05-09 08:07:08 +00:00
parent eff14f3f2c
commit c327cf0810
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/boot/i386/loader/Makefile
View File

@ -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>