diff --git a/.pick_status.json b/.pick_status.json
index 279cf4bcd90..741273d24c7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -301,7 +301,7 @@
         "description": "meson: Fix Clang microsoft-enum-value detection.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "3aee462781abc0bfcce207fb64f9199b43a57542"
     },
diff --git a/meson.build b/meson.build
index b0107a2a32a..c2843a30766 100644
--- a/meson.build
+++ b/meson.build
@@ -1002,10 +1002,6 @@ if cc.get_id() == 'msvc'
       cpp_args += a
     endif
   endforeach
-  if cc.has_argument('-Wmicrosoft-enum-value')  # Clang
-    c_args += '-Wno-microsoft-enum-value'
-    cpp_args += '-Wno-microsoft-enum-value'
-  endif
 else
   _trial = [
     '-Werror=implicit-function-declaration',
@@ -1074,6 +1070,11 @@ else
       cpp_msvc_compat_args += a
     endif
   endforeach
+
+  if cc.has_argument('-Wmicrosoft-enum-value')  # Clang
+    c_args += '-Wno-microsoft-enum-value'
+    cpp_args += '-Wno-microsoft-enum-value'
+  endif
 endif
 
 # set linker arguments