diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /cddl/sbin | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'cddl/sbin')
| -rw-r--r-- | cddl/sbin/zfs/Makefile.depend | 1 | ||||
| -rw-r--r-- | cddl/sbin/zpool/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cddl/sbin/zfs/Makefile.depend b/cddl/sbin/zfs/Makefile.depend index c3b3a22..33d8e6d 100644 --- a/cddl/sbin/zfs/Makefile.depend +++ b/cddl/sbin/zfs/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + cddl/lib/libavl \ cddl/lib/libnvpair \ cddl/lib/libumem \ cddl/lib/libuutil \ diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index 1884d24..bfcb017 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -18,6 +18,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
