summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2019-02-10 01:29:22 +0100
committerBjoern Jacke <bjacke@samba.org>2019-02-17 13:33:15 +0100
commit918bf89dc760e007a36c90be34b4627eb2141157 (patch)
tree97f2304692a0e913e22cdfe203b7c75efbdfc750 /buildtools
parent99dd2ae81079dd210612d97242ffc1835a23fdf0 (diff)
downloadsamba-918bf89dc760e007a36c90be34b4627eb2141157.tar.gz
waf: use the correct WERROR_CFLAGS in CHECK_CODE
all the non gcc version were incorrectly set here till now Signed-off-by: Bjoern Jacke <bjacke@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_autoconf.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 9d45ada1312..7d975393c5b 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -397,13 +397,8 @@ def CHECK_CODE(conf, code, define,
# Be strict when relying on a compiler check
# Some compilers (e.g. xlc) ignore non-supported features as warnings
if strict:
- extra_cflags = None
- if conf.env["CC_NAME"] == "gcc":
- extra_cflags = "-Werror"
- elif conf.env["CC_NAME"] == "xlc":
- extra_cflags = "-qhalt=w"
- if extra_cflags:
- cflags.append(extra_cflags)
+ if 'WERROR_CFLAGS' in conf.env:
+ cflags.extend(conf.env['WERROR_CFLAGS'])
if local_include:
cflags.append('-I%s' % conf.path.abspath())