Fix clang 20 unused-but-set-variables warnings

Suppress error: variable 'yynerrs' set but not used [-Werror,-Wunused-but-set-variable]
                for the code generated from the yacc files.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 8b1f8b9da01e7b3a4f33258331b6cdbcf3aa2c40..ad86a4f025e96b0c730014caf3e0a06b3a6e99aa 100644 (file)
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -836,11 +836,13 @@ int main(void) {
         if CHECK_CFLAGS(conf, ["-Wno-error=declaration-after-statement"]):
             conf.define('HAVE_WNO_ERROR_DECLARATION_AFTER_STATEMENT', 1)
 
+        if CHECK_CFLAGS(conf, ["-Wno-error=unused-but-set-variable"]):
+            conf.define('HAVE_WNO_ERROR_UNUSED_BUT_SET_VARIABLE', 1)
+
         if not Options.options.disable_warnings_as_errors:
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Werror -Wno-error=deprecated-declarations', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=tautological-compare', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=cast-align', testflags=True)
-            conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=unused-but-set-variable', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=unused-function', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=format-truncation', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=cast-qual', testflags=True)

diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build
index 945e5c3c8464190f20184a2f06edcf6e2d182e84..62a22cc151e1f631ce9bde8eeba0eaf66463b5d5 100644 (file)
--- a/libcli/security/wscript_build
+++ b/libcli/security/wscript_build
@@ -1,6 +1,11 @@
 #!/usr/bin/env python
 
 
+parser_cflags = ''
+if bld.CONFIG_SET('HAVE_WNO_UNUSED_BUT_SET_VARIABLE'):
+    # Suppress error: variable 'yynerrs' set but not used [-Werror,-Wunused-but-set-variable]
+    #                 for the generated code.
+    parser_cflags += ' -Wno-error=unused-but-set-variable'
 bld.SAMBA_LIBRARY('samba-security',
                   source=['dom_sid.c',
                           'display_sec.c', 'secace.c', 'secacl.c',
@@ -13,6 +18,7 @@ bld.SAMBA_LIBRARY('samba-security',
                           'claims_transformation.l',
                           'claims_transformation.y',
                   ],
+                  cflags=parser_cflags,
                   private_library=True,
                   deps='stable_sort talloc ndr NDR_SECURITY NDR_CONDITIONAL_ACE')
 

diff --git a/libcli/wsp/wscript_build b/libcli/wsp/wscript_build
index 2d34879a68f4880040dfb9404683ce03bea0b060..d19f8249ccf65f07011708f32d1596a8b84a9adc 100644 (file)
--- a/libcli/wsp/wscript_build
+++ b/libcli/wsp/wscript_build
@@ -20,6 +20,11 @@ parser_cflags=''
 if bld.CONFIG_SET('HAVE_WNO_STRICT_OVERFLOW'):
     parser_cflags += ' -Wno-strict-overflow'
 
+if bld.CONFIG_SET('HAVE_WNO_UNUSED_BUT_SET_VARIABLE'):
+    # Suppress error: variable 'yynerrs' set but not used [-Werror,-Wunused-but-set-variable]
+    #                 for the generated code.
+    parser_cflags += ' -Wno-error=unused-but-set-variable'
+
 bld.SAMBA_SUBSYSTEM('LIBSAMBA_WSP_PARSER',
        source='wsp_aqs_parser.y',
        deps='talloc wsp_flex',