From d8ab6e129d75d7c3f21a7909bf811a3de65faea8 Mon Sep 17 00:00:00 2001 From: Don Brady Date: Wed, 5 Feb 2020 14:01:39 -0700 Subject: 12235 Add libzutil for libzfs or libzpool consumers Portions contributed by: Jerry Jelinek Reviewed by: Matthew Ahrens Reviewed by: Brian Behlendorf Reviewed by: C Fraire Reviewed by: Jason King Approved by: Dan McDonald --- usr/src/lib/libzfs_jni/Makefile.com | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'usr/src/lib/libzfs_jni/Makefile.com') diff --git a/usr/src/lib/libzfs_jni/Makefile.com b/usr/src/lib/libzfs_jni/Makefile.com index 7d2d4bca6c..9c3bc1e523 100644 --- a/usr/src/lib/libzfs_jni/Makefile.com +++ b/usr/src/lib/libzfs_jni/Makefile.com @@ -24,7 +24,7 @@ # # Copyright (c) 2015 by Delphix. All rights reserved. # -# Copyright (c) 2018, Joyent, Inc. +# Copyright 2020 Joyent, Inc. # LIBRARY= libzfs_jni.a @@ -43,9 +43,10 @@ include ../../Makefile.lib LIBS= $(DYNLIB) INCS += -I$(JAVA_ROOT)/include \ - -I$(JAVA_ROOT)/include/solaris + -I$(JAVA_ROOT)/include/solaris \ + -I../../libzutil/common -LDLIBS += -lc -lnvpair -ldiskmgt -lzfs +LDLIBS += -lc -lnvpair -ldiskmgt -lzfs -lzutil CPPFLAGS += $(INCS) $(NOT_RELEASE_BUILD) CPPFLAGS += -DDEBUG CERRWARN += -_gcc=-Wno-switch -- cgit v1.2.3