Module Name:    src
Committed By:   pooka
Date:           Wed Nov 21 17:51:43 UTC 2012

Modified Files:
        src/sys/rump: Makefile.rump

Log Message:
Don't duplicate arbitrary chunks of bsd.sys.mk in here (especially
-Wsign-compare, since that doesn't even work with the kernel, and was
just previously masked by -isystem).  Reorder a bit too.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 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/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.65 src/sys/rump/Makefile.rump:1.66
--- src/sys/rump/Makefile.rump:1.65	Wed Nov 21 17:48:05 2012
+++ src/sys/rump/Makefile.rump	Wed Nov 21 17:51:42 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rump,v 1.65 2012/11/21 17:48:05 pooka Exp $
+#	$NetBSD: Makefile.rump,v 1.66 2012/11/21 17:51:42 pooka Exp $
 #
 
 WARNS?=		3	# XXX: src/sys won't compile with -Wsign-compare yet
@@ -15,22 +15,19 @@ CPPFLAGS+=	-D_RUMPKERNEL
 CPPFLAGS+=	-D_RUMP_NATIVE_ABI
 .endif
 
+CPPFLAGS+=	-DMAXUSERS=32
+CPPFLAGS+=	-DCOMPAT_50=1
+
+CPPFLAGS+=	-nostdinc
 CFLAGS+=	-ffreestanding -fno-strict-aliasing
-.if (defined(HAVE_GCC) && ${HAVE_GCC} >= 3) || defined(HAVE_LLVM)
-CFLAGS+=	-Wsign-compare
-CFLAGS+=	-Wno-pointer-sign -Wno-attributes
-CFLAGS+=	-std=gnu99
-.endif
+
 CWARNFLAGS+=	-Wno-format-zero-length -Wno-pointer-sign
 CPPFLAGS+=	-D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR
-CPPFLAGS+=	-DMAXUSERS=32
-CPPFLAGS+=	-DCOMPAT_50=1
 CPPFLAGS+=	-DDEBUGPRINT
 CPPFLAGS+=	-I${.CURDIR} -I.
 CPPFLAGS+=	-I${RUMPTOP}/../../common/include
 CPPFLAGS+=	-I${RUMPTOP}/include
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern/opt
-CPPFLAGS+=	-nostdinc
 
 .ifdef NEED_ISYSTEM
 CPPFLAGS+=	-isystem ${RUMPTOP}/../arch

Reply via email to