Commit 1012f085 authored by Vinson Lee's avatar Vinson Lee Committed by Dylan Baker
Browse files

meson: Fix Clang microsoft-enum-value detection.

Fixes: 3aee4627

 ("meson: add windows compiler checks and libraries")
Signed-off-by: Vinson Lee's avatarVinson Lee <vlee@freedesktop.org>
Reviewed-by: Dylan Baker's avatarDylan Baker <dylan@pnwbakers.com>
Part-of: <!7543>
(cherry picked from commit bb46a010)
parent 857b9f42
......@@ -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"
},
......@@ -992,10 +992,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',
......@@ -1064,6 +1060,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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment