diff options
author | Andriy Gapon <avg@FreeBSD.org> | 2012-05-09 08:07:08 +0000 |
---|---|---|
committer | Andriy Gapon <avg@FreeBSD.org> | 2012-05-09 08:07:08 +0000 |
commit | 356c95812dcd9721a3167708ee345e4a2ff74efb (patch) | |
tree | 1a1806a4e7da6d06ff42664c89d85665363fb1ea /sys/boot/i386/loader/Makefile | |
parent | a45337f99fe85264abb230be49ea209f3fa3a7b5 (diff) | |
download | src-356c95812dcd9721a3167708ee345e4a2ff74efb.tar.gz src-356c95812dcd9721a3167708ee345e4a2ff74efb.zip |
i386 zfsloader: rename LIBZFS to LIBZFSBOOT
... to avoid name clash with the other libzfs
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=235156
Diffstat (limited to 'sys/boot/i386/loader/Makefile')
-rw-r--r-- | sys/boot/i386/loader/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 9128e6285686..e2f889258cc9 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> |