diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2023-01-27 13:55:46 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-02-01 11:33:17 -0500 |
| commit | 3729b6bcd4087217ad364bf2b84131880a01af40 (patch) | |
| tree | 8f3fe56743fe41c1ba9f4701e3aed78a91a0153a /mesonbuild/compilers | |
| parent | 9e9fa8f8204fd56bd6e56c22062b8297cd65b407 (diff) | |
| download | meson-3729b6bcd4087217ad364bf2b84131880a01af40.zip meson-3729b6bcd4087217ad364bf2b84131880a01af40.tar.gz meson-3729b6bcd4087217ad364bf2b84131880a01af40.tar.bz2 | |
remove /utf-8 option when /validate-charset- is present
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/mixins/visualstudio.py | 4 |
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: |