Tue Dec 15 04:03:55 2009 UTC ()
brace a --fatal-warnings with a NOGCCERROR check.


(mrg)
diff -r1.188 -r1.189 src/share/mk/bsd.sys.mk
cvs diff -r1.188 -r1.189 src/share/mk/bsd.sys.mk (expand / switch to unified diff)

--- src/share/mk/bsd.sys.mk 2009/12/14 01:00:46 1.188
+++ src/share/mk/bsd.sys.mk 2009/12/15 04:03:55 1.189
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.sys.mk,v 1.188 2009/12/14 01:00:46 matt Exp $ 1# $NetBSD: bsd.sys.mk,v 1.189 2009/12/15 04:03:55 mrg Exp $
2# 2#
3# Build definitions used for NetBSD source tree builds. 3# Build definitions used for NetBSD source tree builds.
4 4
5.if !defined(_BSD_SYS_MK_) 5.if !defined(_BSD_SYS_MK_)
6_BSD_SYS_MK_=1 6_BSD_SYS_MK_=1
7 7
8.if defined(WARNS) 8.if defined(WARNS)
9.if ${WARNS} > 0 9.if ${WARNS} > 0
10CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith 10CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
11#CFLAGS+= -Wmissing-declarations -Wredundant-decls -Wnested-externs 11#CFLAGS+= -Wmissing-declarations -Wredundant-decls -Wnested-externs
12# Add -Wno-sign-compare. -Wsign-compare is included in -Wall as of GCC 3.3, 12# Add -Wno-sign-compare. -Wsign-compare is included in -Wall as of GCC 3.3,
13# but our sources aren't up for it yet. Also, add -Wno-traditional because 13# but our sources aren't up for it yet. Also, add -Wno-traditional because
14# gcc includes #elif in the warnings, which is 'this code will not compile 14# gcc includes #elif in the warnings, which is 'this code will not compile
@@ -79,29 +79,31 @@ FOPTS+= -msoft-float @@ -79,29 +79,31 @@ FOPTS+= -msoft-float
79.endif 79.endif
80 80
81.if defined(MKIEEEFP) && (${MKIEEEFP} != "no") 81.if defined(MKIEEEFP) && (${MKIEEEFP} != "no")
82.if ${MACHINE_ARCH} == "alpha" 82.if ${MACHINE_ARCH} == "alpha"
83CFLAGS+= -mieee 83CFLAGS+= -mieee
84FFLAGS+= -mieee 84FFLAGS+= -mieee
85.endif 85.endif
86.endif 86.endif
87 87
88.if ${MACHINE} == "sparc64" && ${MACHINE_ARCH} == "sparc" 88.if ${MACHINE} == "sparc64" && ${MACHINE_ARCH} == "sparc"
89CFLAGS+= -Wa,-Av8plus 89CFLAGS+= -Wa,-Av8plus
90.endif 90.endif
91 91
 92.if !defined(NOGCCERROR)
92.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb") 93.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
93CPUFLAGS+= -Wa,--fatal-warnings 94CPUFLAGS+= -Wa,--fatal-warnings
94.endif 95.endif
 96.endif
95 97
96#.if ${MACHINE} == "sbmips" 98#.if ${MACHINE} == "sbmips"
97#CFLAGS+= -mips64 -mtune=sb1 99#CFLAGS+= -mips64 -mtune=sb1
98#.endif 100#.endif
99 101
100#.if (${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \ 102#.if (${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
101# (defined(MKPIC) && ${MKPIC} == "no") 103# (defined(MKPIC) && ${MKPIC} == "no")
102#CPUFLAGS+= -mno-abicalls -fno-PIC 104#CPUFLAGS+= -mno-abicalls -fno-PIC
103#.endif 105#.endif
104CFLAGS+= ${CPUFLAGS} 106CFLAGS+= ${CPUFLAGS}
105AFLAGS+= ${CPUFLAGS} 107AFLAGS+= ${CPUFLAGS}
106 108
107# Position Independent Executable flags 109# Position Independent Executable flags