libzutil depends on libnvpair
libzutil depends on libnvpair, but this dependency is undeclared in the build system. Therefore it isn't possible to make a new command that depends on libzutil, but does not (directly) depend on libnvpair. This commit makes this dependency explicit. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reivewed-by: Ryan Moeller <freqlabs@FreeBSD.org> Signed-off-by: Matthew Ahrens <mahrens@delphix.com> Closes #10915
This commit is contained in:
parent
8e7fe49b25
commit
9b77c57d5a
@ -6,9 +6,13 @@ if BUILD_LINUX
|
||||
SUBDIRS += libefi
|
||||
endif
|
||||
|
||||
# libnvpair is installed as part of the final build product
|
||||
# libzutil depends on it, so it must be compiled before libzutil
|
||||
SUBDIRS += libnvpair
|
||||
|
||||
# libzutil depends on libefi if present
|
||||
SUBDIRS += libzutil libunicode
|
||||
|
||||
# These five libraries, which are installed as the final build product,
|
||||
# These four libraries, which are installed as the final build product,
|
||||
# incorporate the eight convenience libraries given above.
|
||||
SUBDIRS += libuutil libnvpair libzfs_core libzfs libzpool
|
||||
SUBDIRS += libuutil libzfs_core libzfs libzpool
|
||||
|
@ -40,6 +40,7 @@ libzutil_la_SOURCES = $(USER_C)
|
||||
libzutil_la_LIBADD = \
|
||||
$(abs_top_builddir)/lib/libavl/libavl.la \
|
||||
$(abs_top_builddir)/lib/libtpool/libtpool.la \
|
||||
$(abs_top_builddir)/lib/libnvpair/libnvpair.la \
|
||||
$(abs_top_builddir)/lib/libspl/libspl.la
|
||||
|
||||
if BUILD_LINUX
|
||||
|
Loading…
Reference in New Issue
Block a user