Module Name: src
Committed By: pooka
Date: Wed Nov 21 17:48:06 UTC 2012
Modified Files:
src/sys/modules/solaris: Makefile.solmod
src/sys/modules/zfs: Makefile.zfsmod
src/sys/rump: Makefile.rump
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/solaris/Makefile.solmod
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/zfs/Makefile.zfsmod
cvs rdiff -u -r1.64 -r1.65 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/solaris/Makefile.solmod
diff -u src/sys/modules/solaris/Makefile.solmod:1.3 src/sys/modules/solaris/Makefile.solmod:1.4
--- src/sys/modules/solaris/Makefile.solmod:1.3 Sat Feb 4 18:39:21 2012
+++ src/sys/modules/solaris/Makefile.solmod Wed Nov 21 17:48:05 2012
@@ -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+= -std=c99
# CPPFLAGS+= -D_NFS_NFS_H_
# CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
CPPFLAGS+= -DDIAGNOSTIC
+
+NEED_ISYSTEM= # duplicate headers, depends on -isystem to build
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.3 src/sys/modules/zfs/Makefile.zfsmod:1.4
--- src/sys/modules/zfs/Makefile.zfsmod:1.3 Sun Feb 5 18:46:05 2012
+++ src/sys/modules/zfs/Makefile.zfsmod Wed Nov 21 17:48:05 2012
@@ -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+= -D_PROPLIB_ZFS_CONFLICT
CPPFLAGS+= -DDIAGNOSTIC
# -DZFS_DEBUG
+
+NEED_ISYSTEM= # duplicate headers, depends on -isystem to build
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.64 src/sys/rump/Makefile.rump:1.65
--- src/sys/rump/Makefile.rump:1.64 Tue Nov 13 19:12:42 2012
+++ src/sys/rump/Makefile.rump Wed Nov 21 17:48:05 2012
@@ -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+= -DMAXUSERS=32
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
