summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-09 19:54:40 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-09 20:31:06 +1000
commit5f90d3260be8f30e5d9ccd542aca1807d58d2443 (patch)
treed19d6f4acbc364979247b7d0774319375efcb7b3 /buildtools
parent0d92dd1074971a3c1e3116de5188a475298587a2 (diff)
downloadsamba-5f90d3260be8f30e5d9ccd542aca1807d58d2443.tar.gz
samba-5f90d3260be8f30e5d9ccd542aca1807d58d2443.tar.bz2
samba-5f90d3260be8f30e5d9ccd542aca1807d58d2443.zip
build: added --picky-developer and --fatal-errors
Added configure options for --fatal-errors and --picky-developer. This removes -Wfatal-errors from the --enable-developer flags.
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_autoconf.py8
-rw-r--r--buildtools/wafsamba/wscript6
2 files changed, 13 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 32c7463981..4731a4e13d 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -541,9 +541,15 @@ def SAMBA_CONFIG_H(conf, path=None):
if Options.options.developer:
# we add these here to ensure that -Wstrict-prototypes is not set during configure
- conf.ADD_CFLAGS('-Wall -g -Wfatal-errors -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k',
+ conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k',
testflags=True)
+ if Options.options.picky_developer:
+ conf.ADD_CFLAGS('-Werror', testflags=True)
+
+ if Options.options.fatal_errors:
+ conf.ADD_CFLAGS('-Wfatal-errors', testflags=True)
+
if Options.options.pedantic:
conf.ADD_CFLAGS('-W', testflags=True)
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 9bef9b63b0..1ae6b97640 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -45,6 +45,12 @@ def set_options(opt):
opt.add_option('--enable-developer',
help=("Turn on developer warnings and debugging"),
action="store_true", dest='developer', default=False)
+ opt.add_option('--picky-developer',
+ help=("Treat all warnings as errors (enable -Werror)"),
+ action="store_true", dest='picky_developer', default=False)
+ opt.add_option('--fatal-errors',
+ help=("Stop compilation on first error (enable -Wfatal-errors)"),
+ action="store_true", dest='fatal_errors', default=False)
opt.add_option('--enable-gccdeps',
help=("Enable use gcc -MD dependency module"),
action="store_true", dest='enable_gccdeps', default=False)