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 /Makefile.inc1 | |
| parent | 6e465ac7ce754c86deb574ac4f85927d0b7e755f (diff) | |
| parent | 3c306da80d77021c012776234924b30e70fa51b1 (diff) | |
| download | src-test2-e9832bb1da54c897dd8e319d265b7f8115963770.tar.gz src-test2-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 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index bd3c7218a94b..33af3f91200a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1260,7 +1260,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ - ${_cddl_lib_libumem} \ + ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} @@ -1284,6 +1284,7 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem +_cddl_lib_libnvpair= cddl/lib/libnvpair _cddl_lib= cddl/lib .endif |