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

Make MSVC accept gnu11 as a language standard version. Closes: #7611. 

Fixes: #7611
This commit is contained in:
Jussi Pakkanen 2020-10-17 17:11:42 +03:00 committed by Dylan Baker
parent dffd66e0ff
commit 333e0aeef4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mesonbuild/compilers/c.py
View File

@ -428,7 +428,11 @@ class VisualStudioCCompiler(MSVCCompiler, VisualStudioLikeCCompilerMixin, CCompi
def get_options(self) -> 'OptionDictType': def get_options(self) -> 'OptionDictType':
opts = super().get_options() opts = super().get_options()
c_stds = ['none', 'c89', 'c99', 'c11'] c_stds = ['none', 'c89', 'c99', 'c11',
# Need to have these to be compatible with projects
# that set c_std to e.g. gnu99.
# https://github.com/mesonbuild/meson/issues/7611
'gnu89', 'gnu90', 'gnu9x', 'gnu99', 'gnu1x', 'gnu11']
opts.update({ opts.update({
'std': coredata.UserComboOption( 'std': coredata.UserComboOption(
'C language standard to use', 'C language standard to use',
@ -442,8 +446,8 @@ class VisualStudioCCompiler(MSVCCompiler, VisualStudioLikeCCompilerMixin, CCompi
args = [] args = []
std = options['std'] std = options['std']
# As of MVSC 16.7, /std:c11 is the only valid C standard option. # As of MVSC 16.7, /std:c11 is the only valid C standard option.
if std.value in {'c11'}: if std.value in {'c11', 'gnu11'}:
args.append('/std:' + std.value) args.append('/std:c11')
return args return args