diff options
author | Martin Matuska <mm@FreeBSD.org> | 2012-07-30 23:14:24 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2012-07-30 23:14:24 +0000 |
commit | e9832bb1da54c897dd8e319d265b7f8115963770 (patch) | |
tree | addacafc54e9b837dfab0af6ec0b6b7eff091cbb /cddl/lib | |
parent | 6e465ac7ce754c86deb574ac4f85927d0b7e755f (diff) | |
parent | 3c306da80d77021c012776234924b30e70fa51b1 (diff) | |
download | src-e9832bb1da54c897dd8e319d265b7f8115963770.tar.gz src-e9832bb1da54c897dd8e319d265b7f8115963770.zip |
Partial MFV (illumos-gate 13753:2aba784c276b)
2762 zpool command should have better support for feature flags
References:
https://www.illumos.org/issues/2762
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=238926
Diffstat (limited to 'cddl/lib')
-rw-r--r-- | cddl/lib/libzfs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 369020364bbf..9e68da4c3733 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -6,8 +6,8 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs -DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} -LDADD= -lmd -lpthread -lumem -lutil -lm +DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} +LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair SRCS= deviceid.c \ fsshare.c \ |