ccan/wafbuild: use WERROR_CFLAGS instead of -Werror

diff --git a/lib/ccan/wscript b/lib/ccan/wscript
index 4af9dd4c837aae026cd8f3b125c753662d96ff7f..59b82059c90dcdc721d6098b4d2bd59a4a34487e 100644 (file)
--- a/lib/ccan/wscript
+++ b/lib/ccan/wscript
@@ -7,26 +7,23 @@ def configure(conf):
     conf.CHECK_HEADERS('err.h')
     conf.CHECK_HEADERS('byteswap.h')
     conf.CHECK_FUNCS('bswap_64', link=False, headers="byteswap.h")
-
-    # FIXME: if they don't have -Werror, these will all fail.  But they
-    # probably will anyway...
     conf.CHECK_CODE('int __attribute__((cold)) func(int x) { return x; }',
-                    addmain=False, link=False, cflags="-Werror",
+                    addmain=False, link=False, cflags=conf.env['WERROR_CFLAGS'],
                     define='HAVE_ATTRIBUTE_COLD')
     conf.CHECK_CODE('int __attribute__((const)) func(int x) { return x; }',
-                    addmain=False, link=False, cflags="-Werror",
+                    addmain=False, link=False, cflags=conf.env['WERROR_CFLAGS'],
                     define='HAVE_ATTRIBUTE_CONST')
     conf.CHECK_CODE('void __attribute__((noreturn)) func(int x) { exit(x); }',
-                    addmain=False, link=False, cflags="-Werror",
+                    addmain=False, link=False, cflags=conf.env['WERROR_CFLAGS'],
                     define='HAVE_ATTRIBUTE_NORETURN')
     conf.CHECK_CODE('void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { }',
-                    addmain=False, link=False, cflags="-Werror",
+                    addmain=False, link=False, cflags=conf.env['WERROR_CFLAGS'],
                     define='HAVE_ATTRIBUTE_PRINTF')
     conf.CHECK_CODE('int __attribute__((unused)) func(int x) { return x; }',
-                    addmain=False, link=False, cflags="-Werror",
+                    addmain=False, link=False, cflags=conf.env['WERROR_CFLAGS'],
                     define='HAVE_ATTRIBUTE_UNUSED')
     conf.CHECK_CODE('int __attribute__((used)) func(int x) { return x; }',
-                    addmain=False, link=False, cflags="-Werror",
+                    addmain=False, link=False, cflags=conf.env['WERROR_CFLAGS'],
                     define='HAVE_ATTRIBUTE_USED')
     # We try to use headers for a compile-time test.
     conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
@@ -121,7 +118,7 @@ def configure(conf):
                     link=True,
                     define='HAVE_TYPEOF')
     conf.CHECK_CODE('int __attribute__((warn_unused_result)) func(int x) { return x; }',
-                    addmain=False, link=False, cflags="-Werror",
+                    addmain=False, link=False, cflags=conf.env['WERROR_CFLAGS'],
                     define='HAVE_WARN_UNUSED_RESULT')
 
     # backtrace could be in libexecinfo or in libc