aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorCharles Brunet <charles.brunet@optelgroup.com>2023-01-27 13:55:46 -0500
committerNirbheek Chauhan <nirbheek@centricular.com>2023-02-06 23:37:55 +0530
commit1794471986a487c7662cadde7455052ca7dcb36c (patch)
tree818895331de870170bad85470dfa849dc360137d /mesonbuild
parenta605aad93c9a9896cd2c9efdbb23d030f1813867 (diff)
downloadmeson-1794471986a487c7662cadde7455052ca7dcb36c.zip
meson-1794471986a487c7662cadde7455052ca7dcb36c.tar.gz
meson-1794471986a487c7662cadde7455052ca7dcb36c.tar.bz2
remove /utf-8 option when /validate-charset- is present
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/compilers/mixins/visualstudio.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py
index 765d63d..0473f2e 100644
--- a/mesonbuild/compilers/mixins/visualstudio.py
+++ b/mesonbuild/compilers/mixins/visualstudio.py
@@ -260,7 +260,9 @@ class VisualStudioLikeCompiler(Compiler, metaclass=abc.ABCMeta):
continue
# cl.exe does not allow specifying both, so remove /utf-8 that we
# added automatically in the case the user overrides it manually.
- elif i.startswith('/source-charset:') or i.startswith('/execution-charset:'):
+ elif (i.startswith('/source-charset:')
+ or i.startswith('/execution-charset:')
+ or i == '/validate-charset-'):
try:
result.remove('/utf-8')
except ValueError: