diff options
| author | Don Brady <don.brady@delphix.com> | 2020-02-05 14:01:39 -0700 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-07 07:51:26 -0700 |
| commit | d8ab6e129d75d7c3f21a7909bf811a3de65faea8 (patch) | |
| tree | e9eef2432a5a3e513cd5d156d0aee1b241dbb529 /usr/src/cmd/zfs | |
| parent | fdefee4c75361dc5ea202f7e1f7c49f8a27ea043 (diff) | |
| download | illumos-joyent-d8ab6e129d75d7c3f21a7909bf811a3de65faea8.tar.gz | |
12235 Add libzutil for libzfs or libzpool consumers
Portions contributed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Jason King <jason.king@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/zfs')
| -rw-r--r-- | usr/src/cmd/zfs/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/cmd/zfs/Makefile b/usr/src/cmd/zfs/Makefile index a65371609c..97642e44f9 100644 --- a/usr/src/cmd/zfs/Makefile +++ b/usr/src/cmd/zfs/Makefile @@ -24,7 +24,7 @@ # Copyright 2010 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2012, 2015 by Delphix. All rights reserved. # Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>. -# Copyright 2019 Joyent, Inc. +# Copyright 2020 Joyent, Inc. # PROG= zfs @@ -41,12 +41,13 @@ LINKPROGS= mount umount ROOTETCFSTYPE= $(ROOTETC)/fs/$(FSTYPE) USRLIBFSTYPE= $(ROOTLIB)/fs/$(FSTYPE) -LDLIBS += -lzfs_core -lzfs -luutil -lumem -lnvpair -lsec -lidmap +LDLIBS += -lzfs_core -lzfs -luutil -lumem -lnvpair -lsec -lidmap -lzutil # cmdutils has list(9F) functions used by the project code. LDLIBS += -lcmdutils INCS += -I../../common/zfs INCS += -I$(SRC)/uts/common/fs/zfs +INCS += -I../../lib/libzutil/common CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index bd2f7f4cfe..ef18430bad 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -68,6 +68,7 @@ #include <libzfs_core.h> #include <zfs_prop.h> #include <zfs_deleg.h> +#include <libzutil.h> #include <libuutil.h> #include <aclutils.h> #include <directory.h> |