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

compilers: Standardize the names of compiler options 

Most options don't use language prefaced options (std vs c_std)
internally, as we don't need that due to namespacing. Let's do that
across the board
This commit is contained in:
Dylan Baker 2020-09-29 10:11:30 -07:00
parent 3e62307f3a
commit a28a34c684
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mesonbuild/compilers/c.py
View File

@ -615,9 +615,9 @@ class Xc16CCompiler(Xc16Compiler, CCompiler):
def get_options(self) -> 'OptionDictType': def get_options(self) -> 'OptionDictType':
opts = CCompiler.get_options(self) opts = CCompiler.get_options(self)
opts.update({'c_std': coredata.UserComboOption('C language standard to use', opts.update({'std': coredata.UserComboOption('C language standard to use',
['none', 'c89', 'c99', 'gnu89', 'gnu99'], ['none', 'c89', 'c99', 'gnu89', 'gnu99'],
'none')}) 'none')})
return opts return opts
def get_no_stdinc_args(self) -> T.List[str]: def get_no_stdinc_args(self) -> T.List[str]:
@ -660,9 +660,9 @@ class CompCertCCompiler(CompCertCompiler, CCompiler):
def get_options(self) -> 'OptionDictType': def get_options(self) -> 'OptionDictType':
opts = CCompiler.get_options(self) opts = CCompiler.get_options(self)
opts.update({'c_std': coredata.UserComboOption('C language standard to use', opts.update({'std': coredata.UserComboOption('C language standard to use',
['none', 'c89', 'c99'], ['none', 'c89', 'c99'],
'none')}) 'none')})
return opts return opts
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]: def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
@ -698,9 +698,9 @@ class C2000CCompiler(C2000Compiler, CCompiler):
def get_options(self) -> 'OptionDictType': def get_options(self) -> 'OptionDictType':
opts = CCompiler.get_options(self) opts = CCompiler.get_options(self)
opts.update({'c_std': coredata.UserComboOption('C language standard to use', opts.update({'std': coredata.UserComboOption('C language standard to use',
['none', 'c89', 'c99', 'c11'], ['none', 'c89', 'c99', 'c11'],
'none')}) 'none')})
return opts return opts
def get_no_stdinc_args(self) -> T.List[str]: def get_no_stdinc_args(self) -> T.List[str]:

6
mesonbuild/compilers/cpp.py
View File

@ -790,9 +790,9 @@ class C2000CPPCompiler(C2000Compiler, CPPCompiler):
def get_options(self) -> 'OptionDictType': def get_options(self) -> 'OptionDictType':
opts = CPPCompiler.get_options(self) opts = CPPCompiler.get_options(self)
opts.update({'cpp_std': coredata.UserComboOption('C++ language standard to use', opts.update({'std': coredata.UserComboOption('C++ language standard to use',
['none', 'c++03'], ['none', 'c++03'],
'none')}) 'none')})
return opts return opts
def get_always_args(self) -> T.List[str]: def get_always_args(self) -> T.List[str]:

8
mesonbuild/compilers/cuda.py
View File

@ -197,9 +197,9 @@ class CudaCompiler(Compiler):
def get_options(self) -> 'OptionDictType': def get_options(self) -> 'OptionDictType':
opts = super().get_options() opts = super().get_options()
opts.update({'cuda_std': coredata.UserComboOption('C++ language standard to use', opts.update({'std': coredata.UserComboOption('C++ language standard to use with cuda',
['none', 'c++03', 'c++11', 'c++14'], ['none', 'c++03', 'c++11', 'c++14'],
'none')}) 'none')})
return opts return opts
def _to_host_compiler_options(self, options: 'OptionDictType') -> 'OptionDictType': def _to_host_compiler_options(self, options: 'OptionDictType') -> 'OptionDictType':
@ -212,7 +212,7 @@ class CudaCompiler(Compiler):
# the combination of CUDA version and MSVC version; the --std= is thus ignored # the combination of CUDA version and MSVC version; the --std= is thus ignored
# and attempting to use it will result in a warning: https://stackoverflow.com/a/51272091/741027 # and attempting to use it will result in a warning: https://stackoverflow.com/a/51272091/741027
if not is_windows(): if not is_windows():
std = options['cuda_std'] std = options['std']
if std.value != 'none': if std.value != 'none':
args.append('--std=' + std.value) args.append('--std=' + std.value)