diff options
| -rw-r--r-- | cddl/Makefile.inc | 5 | ||||
| -rw-r--r-- | cddl/lib/libnvpair/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/zfs/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/fstat/zfs/Makefile | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc index bf5804e1978c..f424b270c4dd 100644 --- a/cddl/Makefile.inc +++ b/cddl/Makefile.inc @@ -1,3 +1,6 @@ # $FreeBSD$ -CFLAGS+= -D_SOLARIS_C_SOURCE +OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris +OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris + +IGNORE_PRAGMA= YES diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 57ced0609663..62e0794cc127 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -10,8 +10,8 @@ SRCS= libnvpair.c \ nvpair_alloc_fixed.c \ nvpair.c +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../include # XXX CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include <bsd.lib.mk> diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index c9157af3e761..8ab1e3ea710b 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -76,8 +76,6 @@ CWARNFLAGS+=-Wno-uninitialized CWARNFLAGS+=-Wno-unused CWARNFLAGS+=-Wno-switch -CFLAGS+=-D_SOLARIS_C_SOURCE - CFLAGS+=-I${.CURDIR}/../../compat/opensolaris CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/zmod diff --git a/usr.bin/fstat/zfs/Makefile b/usr.bin/fstat/zfs/Makefile index c8fcae3d53bb..6994c0c4d7e7 100644 --- a/usr.bin/fstat/zfs/Makefile +++ b/usr.bin/fstat/zfs/Makefile @@ -6,7 +6,6 @@ SRCS= zfs.c OBJS= zfs.o WARNS?= 1 -CFLAGS=-D_SOLARIS_C_SOURCE CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem |