[src/trunk]: src/sys Don't unconditionally use the error-silencing magic of -...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5da2f6b80b08
branches:  trunk
changeset: 782815:5da2f6b80b08
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Nov 21 17:48:05 2012 +0000

description:
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.

diffstat:

 sys/modules/solaris/Makefile.solmod |   4 +++-
 sys/modules/zfs/Makefile.zfsmod     |   4 +++-
 sys/rump/Makefile.rump              |  15 ++++++++++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r d0866743161a -r 5da2f6b80b08 sys/modules/solaris/Makefile.solmod
--- a/sys/modules/solaris/Makefile.solmod       Wed Nov 21 17:41:27 2012 +0000
+++ b/sys/modules/solaris/Makefile.solmod       Wed Nov 21 17:48:05 2012 +0000
@@ -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
 
@@ -85,3 +85,5 @@
 # CPPFLAGS+=   -D_NFS_NFS_H_
 # CPPFLAGS+=   -D_PROPLIB_ZFS_CONFLICT
 CPPFLAGS+=     -DDIAGNOSTIC
+
+NEED_ISYSTEM=   # duplicate headers, depends on -isystem to build
diff -r d0866743161a -r 5da2f6b80b08 sys/modules/zfs/Makefile.zfsmod
--- a/sys/modules/zfs/Makefile.zfsmod   Wed Nov 21 17:41:27 2012 +0000
+++ b/sys/modules/zfs/Makefile.zfsmod   Wed Nov 21 17:48:05 2012 +0000
@@ -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
 
@@ -128,3 +128,5 @@
 
 CPPFLAGS+=     -DDIAGNOSTIC
 # -DZFS_DEBUG
+
+NEED_ISYSTEM=  # duplicate headers, depends on -isystem to build
diff -r d0866743161a -r 5da2f6b80b08 sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Wed Nov 21 17:41:27 2012 +0000
+++ b/sys/rump/Makefile.rump    Wed Nov 21 17:48:05 2012 +0000
@@ -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
@@ -27,10 +27,19 @@
 CPPFLAGS+=     -DCOMPAT_50=1
 CPPFLAGS+=     -DDEBUGPRINT
 CPPFLAGS+=     -I${.CURDIR} -I.
-CPPFLAGS+=     -I${RUMPTOP}/../../common/include -isystem ${RUMPTOP}/../arch
+CPPFLAGS+=     -I${RUMPTOP}/../../common/include
 CPPFLAGS+=     -I${RUMPTOP}/include
 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
 
 RUMP_DIAGNOSTIC?=yes