Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Visual Studio: Drop /utf-8 if it is not supported 

We assume /utf-8 for all C builds unless /source-charset or
/execution-charset is specified, but then this will cause trouble for
Visual Studio 2013 or earler since the /utf-8 flag is only supported
since Visual Studio 2015.  Specifically, if we try to check whether
compiler flags are supported, those checks will fail since /utf-8 is
never supported on these older Visual Studio versions.

Drop /utf-8 from get_always_args() if we are using Visual Studio 2013
or earlier.
This commit is contained in:
Chun-wei Fan 2023-01-10 15:28:37 +08:00 committed by Nirbheek Chauhan
parent 4fa5b2ee42
commit 9bbceeee06
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mesonbuild/compilers/mixins/visualstudio.py
View File

@ -105,6 +105,8 @@ class VisualStudioLikeCompiler(Compiler, metaclass=abc.ABCMeta):
# See: https://ninja-build.org/manual.html#_deps # See: https://ninja-build.org/manual.html#_deps
# Assume UTF-8 sources by default, but self.unix_args_to_native() removes it # Assume UTF-8 sources by default, but self.unix_args_to_native() removes it
# if `/source-charset` is set too. # if `/source-charset` is set too.
# It is also dropped if Visual Studio 2013 or earlier is used, since it would
# not be supported in that case.
always_args = ['/nologo', '/showIncludes', '/utf-8'] always_args = ['/nologo', '/showIncludes', '/utf-8']
warn_args = { warn_args = {
'0': [], '0': [],
@ -429,6 +431,14 @@ class MSVCCompiler(VisualStudioLikeCompiler):
args = ['/FS'] + args args = ['/FS'] + args
return args return args
# Override CCompiler.get_always_args
# We want to drop '/utf-8' for Visual Studio 2013 and earlier
def get_always_args(self) -> T.List[str]:
if mesonlib.version_compare(self.version, '<19.00'):
if '/utf-8' in self.always_args:
self.always_args.remove('/utf-8')
return self.always_args
def get_instruction_set_args(self, instruction_set: str) -> T.Optional[T.List[str]]: def get_instruction_set_args(self, instruction_set: str) -> T.Optional[T.List[str]]:
if self.version.split('.')[0] == '16' and instruction_set == 'avx': if self.version.split('.')[0] == '16' and instruction_set == 'avx':
# VS documentation says that this exists and should work, but # VS documentation says that this exists and should work, but