diff options
| author | ed <ed@FreeBSD.org> | 2009-12-31 00:07:26 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2009-12-31 00:07:26 +0000 |
| commit | 97b61f2cf34a427235b0b8880ead5cca851eb987 (patch) | |
| tree | 2e14896716a8b2186e5dd2bdd3b8237daba0a90a | |
| parent | 25922a4d78e011eae9655f948f5d51c6d5d48749 (diff) | |
| download | FreeBSD-src-97b61f2cf34a427235b0b8880ead5cca851eb987.zip FreeBSD-src-97b61f2cf34a427235b0b8880ead5cca851eb987.tar.gz | |
Disable K&R style function definitions for WARNS=6.
Unfortunately there are two slight problems with that:
- Yacc and lex might generate code that generates warnings because of
this. Require yacc and lex to be rebuilt during bootstrap. I'm not
incrementing __FreeBSD_version here, because I assume someone else
will do this eventually.
- When running `make buildkernel', it uses share/mk from the source
treeo to build aicasm. Because aicasm also depends on lex, this would
break. Lower WARNS to 5 for now. We should just increment it to 6
again somewhere in the very far future.
| -rw-r--r-- | Makefile.inc1 | 7 | ||||
| -rw-r--r-- | share/mk/bsd.sys.mk | 3 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aicasm/Makefile | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 249cf63..a3499f3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -940,6 +940,11 @@ _mklocale= usr.bin/mklocale _sed= usr.bin/sed .endif +.if ${BOOTSTRAPPING} < 900006 +_lex= usr.bin/lex +_yacc= usr.bin/yacc +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -966,6 +971,8 @@ bootstrap-tools: ${_mklocale} \ usr.bin/rpcgen \ ${_sed} \ + ${_lex} \ + ${_yacc} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 9a189a6..9b36663 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -47,7 +47,8 @@ CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\ . endif # BDECFLAGS . if ${WARNS} >= 6 -CWARNFLAGS += -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls +CWARNFLAGS += -Wchar-subscripts -Winline -Wnested-externs\ + -Wredundant-decls -Wold-style-definition . endif . if ${WARNS} >= 2 && ${WARNS} <= 4 # XXX Delete -Wuninitialized by default for now -- the compiler doesn't diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile index 222c96a..9c73493 100644 --- a/sys/dev/aic7xxx/aicasm/Makefile +++ b/sys/dev/aic7xxx/aicasm/Makefile @@ -15,7 +15,7 @@ SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS} CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g} DPADD= ${LIBL} LDADD= -ll -WARNS?= 6 +WARNS?= 5 # Correct path for kernel builds # Don't rely on the kernel's .depend file |
