diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-26 18:32:36 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-26 18:32:36 +0000 |
| commit | 8aef19f7563fa7e20f072f46202468eb3bda3868 (patch) | |
| tree | cd9a1b1f0d83a83bdf98e50ab1418774cce610ed /usr/src/cmd/mdb/intel/amd64 | |
| parent | f4df7cccbc6a219c58b697781910766c28800dd9 (diff) | |
| parent | f67cf39ba88ad7c4bee81445cc7a7468e0289f01 (diff) | |
| download | illumos-joyent-8aef19f7563fa7e20f072f46202468eb3bda3868.tar.gz | |
[illumos-gate merge]
commit f67cf39ba88ad7c4bee81445cc7a7468e0289f01
commit 7edb9f69d2426b044fa60c7a168c9eaeb12f1884
6431 document FreeBSD regex extensions
commit dfc115332c94a2f62058ac7f2bce7631fbd20b3d
7431 ZFS Channel Programs
Conflicts:
usr/src/lib/libzpool/common/sys/zfs_context.h
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/lib/libzfs/common/libzfs_impl.h
Diffstat (limited to 'usr/src/cmd/mdb/intel/amd64')
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/zfs/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile index bae4d7f502..870f91ad99 100644 --- a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile @@ -23,6 +23,8 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2016 by Delphix. All rights reserved. +# MODULE = zfs.so MDBTGT = kvm @@ -36,6 +38,7 @@ include ../../../Makefile.module include ../../../common/modules/zfs/Makefile.zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs +CPPFLAGS += -I../../../../../uts/common/fs/zfs/lua C99MODE= -xc99=%all C99LMODE= -Xc99=%all |