Don't unconditionally use the error-silencing magic of -isystem
(as opposed to -I) on every component, only the zfs ones depend on it to build. Regular modules might benefit from a similar move.
This commit is contained in:
parent
b65f40a8c1
commit
8d40a1e7f7
|
@ -1,4 +1,4 @@
|
||||||
# $NetBSD: Makefile.solmod,v 1.3 2012/02/04 18:39:21 christos Exp $
|
# $NetBSD: Makefile.solmod,v 1.4 2012/11/21 17:48:05 pooka Exp $
|
||||||
|
|
||||||
ZFSDIR= ${S}/../external/cddl/osnet
|
ZFSDIR= ${S}/../external/cddl/osnet
|
||||||
|
|
||||||
|
@ -85,3 +85,5 @@ CPPFLAGS+= -std=c99
|
||||||
# CPPFLAGS+= -D_NFS_NFS_H_
|
# CPPFLAGS+= -D_NFS_NFS_H_
|
||||||
# CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
|
# CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
|
||||||
CPPFLAGS+= -DDIAGNOSTIC
|
CPPFLAGS+= -DDIAGNOSTIC
|
||||||
|
|
||||||
|
NEED_ISYSTEM= # duplicate headers, depends on -isystem to build
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $NetBSD: Makefile.zfsmod,v 1.3 2012/02/05 18:46:05 christos Exp $
|
# $NetBSD: Makefile.zfsmod,v 1.4 2012/11/21 17:48:05 pooka Exp $
|
||||||
|
|
||||||
ZFSDIR= ${S}/../external/cddl/osnet
|
ZFSDIR= ${S}/../external/cddl/osnet
|
||||||
|
|
||||||
|
@ -128,3 +128,5 @@ CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
|
||||||
|
|
||||||
CPPFLAGS+= -DDIAGNOSTIC
|
CPPFLAGS+= -DDIAGNOSTIC
|
||||||
# -DZFS_DEBUG
|
# -DZFS_DEBUG
|
||||||
|
|
||||||
|
NEED_ISYSTEM= # duplicate headers, depends on -isystem to build
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $NetBSD: Makefile.rump,v 1.64 2012/11/13 19:12:42 pooka Exp $
|
# $NetBSD: Makefile.rump,v 1.65 2012/11/21 17:48:05 pooka Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
|
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
|
||||||
|
@ -27,10 +27,19 @@ CPPFLAGS+= -DMAXUSERS=32
|
||||||
CPPFLAGS+= -DCOMPAT_50=1
|
CPPFLAGS+= -DCOMPAT_50=1
|
||||||
CPPFLAGS+= -DDEBUGPRINT
|
CPPFLAGS+= -DDEBUGPRINT
|
||||||
CPPFLAGS+= -I${.CURDIR} -I.
|
CPPFLAGS+= -I${.CURDIR} -I.
|
||||||
CPPFLAGS+= -I${RUMPTOP}/../../common/include -isystem ${RUMPTOP}/../arch
|
CPPFLAGS+= -I${RUMPTOP}/../../common/include
|
||||||
CPPFLAGS+= -I${RUMPTOP}/include
|
CPPFLAGS+= -I${RUMPTOP}/include
|
||||||
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
|
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
|
||||||
CPPFLAGS+= -nostdinc -isystem ${RUMPTOP}/..
|
CPPFLAGS+= -nostdinc
|
||||||
|
|
||||||
|
.ifdef NEED_ISYSTEM
|
||||||
|
CPPFLAGS+= -isystem ${RUMPTOP}/../arch
|
||||||
|
CPPFLAGS+= -isystem ${RUMPTOP}/..
|
||||||
|
.else
|
||||||
|
CPPFLAGS+= -I${RUMPTOP}/../arch
|
||||||
|
CPPFLAGS+= -I${RUMPTOP}/..
|
||||||
|
.endif
|
||||||
|
|
||||||
LDFLAGS+= -T ${RUMPTOP}/ldscript.rump
|
LDFLAGS+= -T ${RUMPTOP}/ldscript.rump
|
||||||
|
|
||||||
RUMP_DIAGNOSTIC?=yes
|
RUMP_DIAGNOSTIC?=yes
|
||||||
|
|
Loading…
Reference in New Issue