summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-06-15 10:48:48 +0000
committerbapt <bapt@FreeBSD.org>2015-06-15 10:48:48 +0000
commit2a3ec90af9d2a29ddfcfb0f66265da87045c2530 (patch)
treee2e2ef4e98e30238e947a986b20a8252c87018b9 /cddl
parent1f7642cc6f9e7a88f2e1524cbafc9b64fcff56f8 (diff)
downloadFreeBSD-src-2a3ec90af9d2a29ddfcfb0f66265da87045c2530.zip
FreeBSD-src-2a3ec90af9d2a29ddfcfb0f66265da87045c2530.tar.gz
Fix circular dependency between libzfs and libzfs_core
libzfs_core is the wrapper around kernel ioctls, the ioctl compat code belongs to it
Diffstat (limited to 'cddl')
-rw-r--r--cddl/lib/libzfs/Makefile1
-rw-r--r--cddl/lib/libzfs_core/Makefile3
2 files changed, 2 insertions, 2 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index b2f4352..19a3f2e 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -37,7 +37,6 @@ SRCS+= libzfs_changelist.c \
zfs_comutil.c \
zfs_deleg.c \
zfs_fletcher.c \
- zfs_ioctl_compat.c \
zfs_namecheck.c \
zfs_prop.c \
zpool_prop.c \
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index a470fbc..99ab34d 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -11,7 +11,8 @@ DPADD= ${LIBNVPAIR}
LDADD= -lnvpair
SRCS= libzfs_core.c \
- libzfs_core_compat.c
+ libzfs_core_compat.c \
+ zfs_ioctl_compat.c
SRCS+= libzfs_compat.c
OpenPOWER on IntegriCloud