summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-08-17 20:43:07 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-08-17 14:50:16 +0200
commit6ce362afeff0cb5094eb6b1ecfa639252cdcc7f8 (patch)
tree4e18a116a44b549e2e3254a43d94297110034d50
parenta7b8e9f562780dc6a3487644623decd1cff226e2 (diff)
downloadsamba-6ce362afeff0cb5094eb6b1ecfa639252cdcc7f8.tar.gz
samba-6ce362afeff0cb5094eb6b1ecfa639252cdcc7f8.tar.bz2
samba-6ce362afeff0cb5094eb6b1ecfa639252cdcc7f8.zip
build: Ensure -Werror=format works with -Wformat=2 on NULL format strings
This should fix the build on some gcc versions, (noticed on FreeBSD by Volker). We want the protection of -Werror=format without the errors extending to the format string itself being NULL, because that is valid for ldb_search(). Andrew Bartlett Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Fri Aug 17 14:50:16 CEST 2012 on sn-devel-104
-rw-r--r--buildtools/wafsamba/samba_autoconf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 03c2b242fb..50039fccc3 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -629,7 +629,7 @@ def SAMBA_CONFIG_H(conf, path=None):
# This check is because for ldb_search(), a NULL format string
# is not an error, but some compilers complain about that.
- if CHECK_CFLAGS(conf, "-Werror=format", '''
+ if CHECK_CFLAGS(conf, ["-Werror=format", "-Wformat=2"], '''
int testformat(char *format, ...) __attribute__ ((format (__printf__, 1, 2)));
int main(void) {