diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
index db205044025..f396c86211a 100644
--- a/src/amd/addrlib/meson.build
+++ b/src/amd/addrlib/meson.build
@@ -53,12 +53,14 @@ files_addrlib = files(
 )
 
 cpp_args_addrlib = []
-if cpp.get_id() != 'msvc'
-  cpp_args_addrlib += '-Wno-unused-variable'
-  cpp_args_addrlib += '-Wno-unused-local-typedefs'
-  cpp_args_addrlib += '-Wno-unused-but-set-variable'
-  cpp_args_addrlib += '-Wno-maybe-uninitialized'
-endif
+foreach w : ['-Wno-unused-variable', '-Wno-unused-local-typedefs',
+             '-Wno-unused-but-set-variable', '-Wno-maybe-uninitialized']
+  if cpp.has_argument(w)
+    cpp_args_addrlib += w
+  endif
+endforeach
+
+message(cpp_args_addrlib)
 
 libamdgpu_addrlib = static_library(
   'addrlib',