diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
index 7bd7097afbb..81c35f20125 100644
--- a/src/amd/addrlib/meson.build
+++ b/src/amd/addrlib/meson.build
@@ -61,13 +61,11 @@ else
   cpp_args_addrlib += '-DBIGENDIAN_CPU'
 endif
 
-foreach w : ['-Wno-unused-variable', '-Wno-unused-local-typedefs',
-             '-Wno-unused-but-set-variable', '-Wno-maybe-uninitialized',
-             '-Wno-self-assign']
-  if cpp.has_argument(w)
-    cpp_args_addrlib += w
-  endif
-endforeach
+cpp_args_addrlib += cpp.get_supported_arguments(
+  ['-Wno-unused-variable', '-Wno-unused-local-typedefs',
+   '-Wno-unused-but-set-variable', '-Wno-maybe-uninitialized',
+   '-Wno-self-assign']
+)
 
 libamdgpu_addrlib = static_library(
   'addrlib',