summaryrefslogtreecommitdiffstats
path: root/cddl/lib
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2014-05-27 18:22:52 +0000
committerdelphij <delphij@FreeBSD.org>2014-05-27 18:22:52 +0000
commitc49d771309eb7e07bc9723455a2c4ac46c9f3716 (patch)
tree5756828c06cfa825fb016f65ca2c87a1e98ea6ec /cddl/lib
parent4be89b4268d840a616fe6faa0dc2655e1f8e0f7c (diff)
downloadFreeBSD-src-c49d771309eb7e07bc9723455a2c4ac46c9f3716.zip
FreeBSD-src-c49d771309eb7e07bc9723455a2c4ac46c9f3716.tar.gz
MFC r266520:
Explicitly link libzfs against libavl as it is done in OpenSolaris (4543:12bb2876a62e). Without this, some third party applications may break because the lack of AVL related symbols. FreeBSD base system are not affected because the FreeBSD ZFS command line tools were all linked against libavl and thus hide the underlying issue. PR: bin/183081
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/libzfs/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index 16660ac..4010ac1 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -7,8 +7,8 @@
LIB= zfs
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- ${LIBZFS_CORE}
-LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core
+ ${LIBAVL} ${LIBZFS_CORE}
+LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
SRCS= deviceid.c \
fsshare.c \
OpenPOWER on IntegriCloud