diff options
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 9 | ||||
| -rw-r--r-- | lib/replace/wscript | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 01134cd26b..6f8985a521 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -139,7 +139,9 @@ def CHECK_FUNC(conf, f, checklink=False, header=''): if CONFIG_SET(conf, define): return True if checklink: - return CHECK_CODE(conf, 'void *x = (void *)%s' % f, execute=False, define=define) + return CHECK_CODE(conf, 'void *x = (void *)%s' % f, + execute=False, define=define, + msg='Checking for %s' % f) return conf.check_cc(function_name=f, header_name=hlist) @@ -365,6 +367,11 @@ def SAMBA_CONFIG_H(conf, path=None): # when we are building projects that depend on lib/replace if os.path.realpath(conf.curdir) != os.path.realpath(Options.launch_dir): return + + 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') + if path is None: conf.write_config_header('config.h', top=True) else: diff --git a/lib/replace/wscript b/lib/replace/wscript index ef6b4237cc..fa0e40d21a 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -242,9 +242,6 @@ def configure(conf): if Options.options.pedantic: conf.ADD_CFLAGS('-W') - if Options.options.developer: - 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.SAMBA_CONFIG_H() conf.SAMBA_BUILD_ENV() |