Mesa (master): meson: Fix Clang microsoft-enum-value detection.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: bb46a010bbe9f703ff9d48e450dbd6529906b8e9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb46a010bbe9f703ff9d48e450dbd6529906b8e9

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Tue Nov 10 18:17:57 2020 -0800

meson: Fix Clang microsoft-enum-value detection.

Fixes: 3aee462781a ("meson: add windows compiler checks and libraries")
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7543>

---

 meson.build | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 015bc974573..f87ec1495a9 100644
--- a/meson.build
+++ b/meson.build
@@ -1030,10 +1030,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',
@@ -1102,6 +1098,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