kernel: Some adjustments for the GCC 4.1 removal in Makefiles.
authorSascha Wildner <saw@online.de>
Fri, 12 Oct 2012 08:16:20 +0000 (10:16 +0200)
committerSascha Wildner <saw@online.de>
Fri, 12 Oct 2012 08:16:20 +0000 (10:16 +0200)
sys/conf/bsd.kern.mk
sys/conf/kern.pre.mk

index d13a63e..3b233e3 100644 (file)
@@ -9,11 +9,8 @@
 
 CWARNFLAGS?=   -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
                -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-               -Wold-style-definition -Wno-pointer-sign -std=c99
-
-.if ${CCVER} != "gcc41"
-CWARNFLAGS+=   -Wold-style-declaration
-.endif
+               -Wold-style-definition -Wold-style-declaration \
+               -Wno-pointer-sign -std=c99
 
 CFLAGS+= -finline-limit=${INLINE_LIMIT}
 CFLAGS+= --param inline-unit-growth=100
index d944533..ae2a039 100644 (file)
@@ -79,7 +79,7 @@ PROFILE_C= ${CC} -c ${CFLAGS} ${.IMPSRC}
 NORMAL_M= awk -f $S/tools/makeobjops.awk -- -c $<; \
        ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c
 
-.if !defined(NO_WERROR) && (${CCVER} == "gcc41" || ${CCVER} == "gcc44")
+.if !defined(NO_WERROR) && ${CCVER} == "gcc44"
 WERROR=-Werror
 .endif