compilers: define standards in the base language compiler
And then update the choices in each leaf class. This way we don't end up with another case where we implicitly allow an invalid standard to be set on a compiler that doesn't have a 'std' setting currently.
This commit is contained in:
Dylan Baker
parent
a28a34c684
commit
2844afedde
|
|
@ -95,6 +95,17 @@ class CCompiler(CLikeCompiler, Compiler):
|
|||
return self.compiles(t.format(**fargs), env, extra_args=extra_args,
|
||||
dependencies=dependencies)
|
||||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = super().get_options()
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C langauge standard to use',
|
||||
['none'],
|
||||
'none',
|
||||
)
|
||||
})
|
||||
return opts
|
||||
|
||||
|
||||
class ClangCCompiler(ClangCompiler, CCompiler):
|
||||
|
||||
|
|
@ -130,13 +141,7 @@ class ClangCCompiler(ClangCompiler, CCompiler):
|
|||
if version_compare(self.version, self._C2X_VERSION):
|
||||
c_stds += ['c2x']
|
||||
g_stds += ['gnu2x']
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
['none'] + c_stds + g_stds,
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['none'] + c_stds + g_stds # type: ignore
|
||||
if self.info.is_windows() or self.info.is_cygwin():
|
||||
opts.update({
|
||||
'winlibs': coredata.UserArrayOption(
|
||||
|
|
@ -207,13 +212,7 @@ class ArmclangCCompiler(ArmclangCompiler, CCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = CCompiler.get_options(self)
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
['none', 'c90', 'c99', 'c11', 'gnu90', 'gnu99', 'gnu11'],
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['none', 'c90', 'c99', 'c11', 'gnu90', 'gnu99', 'gnu11'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -255,13 +254,7 @@ class GnuCCompiler(GnuCompiler, CCompiler):
|
|||
if version_compare(self.version, self._C2X_VERSION):
|
||||
c_stds += ['c2x']
|
||||
g_stds += ['gnu2x']
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
['none'] + c_stds + g_stds,
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['none'] + c_stds + g_stds # type: ignore
|
||||
if self.info.is_windows() or self.info.is_cygwin():
|
||||
opts.update({
|
||||
'winlibs': coredata.UserArrayOption(
|
||||
|
|
@ -327,17 +320,11 @@ class ElbrusCCompiler(GnuCCompiler, ElbrusCompiler):
|
|||
# It does support some various ISO standards and c/gnu 90, 9x, 1x in addition to those which GNU CC supports.
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = CCompiler.get_options(self)
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
[
|
||||
'none', 'c89', 'c90', 'c9x', 'c99', 'c1x', 'c11',
|
||||
'gnu89', 'gnu90', 'gnu9x', 'gnu99', 'gnu1x', 'gnu11',
|
||||
'iso9899:2011', 'iso9899:1990', 'iso9899:199409', 'iso9899:1999',
|
||||
],
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = [ # type: ignore
|
||||
'none', 'c89', 'c90', 'c9x', 'c99', 'c1x', 'c11',
|
||||
'gnu89', 'gnu90', 'gnu9x', 'gnu99', 'gnu1x', 'gnu11',
|
||||
'iso9899:2011', 'iso9899:1990', 'iso9899:199409', 'iso9899:1999',
|
||||
]
|
||||
return opts
|
||||
|
||||
# Elbrus C compiler does not have lchmod, but there is only linker warning, not compiler error.
|
||||
|
|
@ -374,13 +361,7 @@ class IntelCCompiler(IntelGnuLikeCompiler, CCompiler):
|
|||
g_stds = ['gnu89', 'gnu99']
|
||||
if version_compare(self.version, '>=16.0.0'):
|
||||
c_stds += ['c11']
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
['none'] + c_stds + g_stds,
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['none'] + c_stds + g_stds # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -433,13 +414,7 @@ class VisualStudioCCompiler(MSVCCompiler, VisualStudioLikeCCompilerMixin, CCompi
|
|||
# that set c_std to e.g. gnu99.
|
||||
# https://github.com/mesonbuild/meson/issues/7611
|
||||
'gnu89', 'gnu90', 'gnu9x', 'gnu99', 'gnu1x', 'gnu11']
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
c_stds,
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = c_stds # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -472,13 +447,7 @@ class ClangClCCompiler(ClangClCompiler, VisualStudioLikeCCompilerMixin, CCompile
|
|||
# that set c_std to e.g. gnu99.
|
||||
# https://github.com/mesonbuild/meson/issues/7611
|
||||
'gnu89', 'gnu90', 'gnu9x', 'gnu99']
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
c_stds,
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = c_stds # type: ignore
|
||||
return opts
|
||||
|
||||
|
||||
|
|
@ -498,14 +467,7 @@ class IntelClCCompiler(IntelVisualStudioLikeCompiler, VisualStudioLikeCCompilerM
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = super().get_options()
|
||||
c_stds = ['none', 'c89', 'c99', 'c11']
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
c_stds,
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['none', 'c89', 'c99', 'c11'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -531,13 +493,7 @@ class ArmCCompiler(ArmCompiler, CCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = CCompiler.get_options(self)
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
['none', 'c90', 'c99'],
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['none', 'c89', 'c99', 'c11'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -564,13 +520,7 @@ class CcrxCCompiler(CcrxCompiler, CCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = CCompiler.get_options(self)
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C language standard to use',
|
||||
['none', 'c89', 'c99'],
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['none', 'c89', 'c99'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_no_stdinc_args(self) -> T.List[str]:
|
||||
|
|
@ -615,9 +565,7 @@ class Xc16CCompiler(Xc16Compiler, CCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = CCompiler.get_options(self)
|
||||
opts.update({'std': coredata.UserComboOption('C language standard to use',
|
||||
['none', 'c89', 'c99', 'gnu89', 'gnu99'],
|
||||
'none')})
|
||||
opts['std'].choices = ['none', 'c89', 'c99', 'gnu89', 'gnu99'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_no_stdinc_args(self) -> T.List[str]:
|
||||
|
|
@ -660,9 +608,7 @@ class CompCertCCompiler(CompCertCompiler, CCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = CCompiler.get_options(self)
|
||||
opts.update({'std': coredata.UserComboOption('C language standard to use',
|
||||
['none', 'c89', 'c99'],
|
||||
'none')})
|
||||
opts['std'].choices = ['none', 'c89', 'c99'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -698,9 +644,7 @@ class C2000CCompiler(C2000Compiler, CCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = CCompiler.get_options(self)
|
||||
opts.update({'std': coredata.UserComboOption('C language standard to use',
|
||||
['none', 'c89', 'c99', 'c11'],
|
||||
'none')})
|
||||
opts['std'].choices = ['none', 'c89', 'c99', 'c11'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_no_stdinc_args(self) -> T.List[str]:
|
||||
|
|
|
|||
|
|
@ -167,6 +167,17 @@ class CPPCompiler(CLikeCompiler, Compiler):
|
|||
|
||||
raise MesonException('C++ Compiler does not support -std={}'.format(cpp_std))
|
||||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = super().get_options()
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C++ language standard to use',
|
||||
['none'],
|
||||
'none',
|
||||
),
|
||||
})
|
||||
return opts
|
||||
|
||||
|
||||
class ClangCPPCompiler(ClangCompiler, CPPCompiler):
|
||||
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
|
||||
|
|
@ -192,13 +203,11 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler):
|
|||
'default',
|
||||
),
|
||||
'rtti': coredata.UserBooleanOption('Enable RTTI', True),
|
||||
'std': coredata.UserComboOption(
|
||||
'C++ language standard to use',
|
||||
['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a',
|
||||
'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'],
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = [ # type: ignore
|
||||
'none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z',
|
||||
'c++2a', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a',
|
||||
]
|
||||
if self.info.is_windows() or self.info.is_cygwin():
|
||||
opts.update({
|
||||
'winlibs': coredata.UserArrayOption(
|
||||
|
|
@ -283,15 +292,11 @@ class ArmclangCPPCompiler(ArmclangCompiler, CPPCompiler):
|
|||
['none', 'default', 'a', 's', 'sc'],
|
||||
'default',
|
||||
),
|
||||
'std': coredata.UserComboOption(
|
||||
'C++ language standard to use',
|
||||
[
|
||||
'none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17',
|
||||
'gnu++98', 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17',
|
||||
],
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = [ # type: ignore
|
||||
'none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'gnu++98',
|
||||
'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17',
|
||||
]
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -332,17 +337,16 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
|
|||
'default',
|
||||
),
|
||||
'rtti': coredata.UserBooleanOption('Enable RTTI', True),
|
||||
'std': coredata.UserComboOption(
|
||||
'C++ language standard to use',
|
||||
['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a',
|
||||
'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z', 'gnu++2a'],
|
||||
'none',
|
||||
),
|
||||
'debugstl': coredata.UserBooleanOption(
|
||||
'STL debug mode',
|
||||
False,
|
||||
)
|
||||
})
|
||||
opts['std'].choices = [ # type: ignore
|
||||
'none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z',
|
||||
'c++2a', 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z',
|
||||
'gnu++2a',
|
||||
]
|
||||
if self.info.is_windows() or self.info.is_cygwin():
|
||||
opts.update({
|
||||
'winlibs': coredata.UserArrayOption(
|
||||
|
|
@ -437,16 +441,12 @@ class ElbrusCPPCompiler(GnuCPPCompiler, ElbrusCompiler):
|
|||
['none', 'default', 'a', 's', 'sc'],
|
||||
'default',
|
||||
),
|
||||
'std': coredata.UserComboOption(
|
||||
'C++ language standard to use',
|
||||
cpp_stds,
|
||||
'none',
|
||||
),
|
||||
'debugstl': coredata.UserBooleanOption(
|
||||
'STL debug mode',
|
||||
False,
|
||||
),
|
||||
})
|
||||
opts['std'].choices = cpp_stds # type: ignore
|
||||
return opts
|
||||
|
||||
# Elbrus C++ compiler does not have lchmod, but there is only linker warning, not compiler error.
|
||||
|
|
@ -515,13 +515,9 @@ class IntelCPPCompiler(IntelGnuLikeCompiler, CPPCompiler):
|
|||
'default',
|
||||
),
|
||||
'rtti': coredata.UserBooleanOption('Enable RTTI', True),
|
||||
'std': coredata.UserComboOption(
|
||||
'C++ language standard to use',
|
||||
['none'] + c_stds + g_stds,
|
||||
'none',
|
||||
),
|
||||
'debugstl': coredata.UserBooleanOption('STL debug mode', False),
|
||||
})
|
||||
opts['std'].choices = ['none'] + c_stds + g_stds # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -573,16 +569,12 @@ class VisualStudioLikeCPPCompilerMixin(CompilerMixinBase):
|
|||
'default',
|
||||
),
|
||||
'rtti': coredata.UserBooleanOption('Enable RTTI', True),
|
||||
'std': coredata.UserComboOption(
|
||||
'C++ language standard to use',
|
||||
cpp_stds,
|
||||
'none',
|
||||
),
|
||||
'winlibs': coredata.UserArrayOption(
|
||||
'Windows libs to link against.',
|
||||
msvc_winlibs,
|
||||
),
|
||||
})
|
||||
opts['std'].choices = cpp_stds # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -726,13 +718,7 @@ class ArmCPPCompiler(ArmCompiler, CPPCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = CPPCompiler.get_options(self)
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'C++ language standard to use',
|
||||
['none', 'c++03', 'c++11'],
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['none', 'c++03', 'c++11'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -790,9 +776,7 @@ class C2000CPPCompiler(C2000Compiler, CPPCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = CPPCompiler.get_options(self)
|
||||
opts.update({'std': coredata.UserComboOption('C++ language standard to use',
|
||||
['none', 'c++03'],
|
||||
'none')})
|
||||
opts['std'].choices = ['none', 'c++03'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_always_args(self) -> T.List[str]:
|
||||
|
|
|
|||
|
|
@ -150,6 +150,17 @@ class FortranCompiler(CLikeCompiler, Compiler):
|
|||
def has_multi_link_arguments(self, args: T.List[str], env: 'Environment') -> T.Tuple[bool, bool]:
|
||||
return self._has_multi_link_arguments(args, env, 'stop; end program')
|
||||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = super().get_options()
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'Fortran language standard to use',
|
||||
['none'],
|
||||
'none',
|
||||
),
|
||||
})
|
||||
return opts
|
||||
|
||||
|
||||
class GnuFortranCompiler(GnuCompiler, FortranCompiler):
|
||||
|
||||
|
|
@ -175,13 +186,7 @@ class GnuFortranCompiler(GnuCompiler, FortranCompiler):
|
|||
fortran_stds += ['f2008']
|
||||
if version_compare(self.version, '>=8.0.0'):
|
||||
fortran_stds += ['f2018']
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'Fortran language standard to use',
|
||||
['none'] + fortran_stds,
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['none'] + fortran_stds # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -310,14 +315,7 @@ class IntelFortranCompiler(IntelGnuLikeCompiler, FortranCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = FortranCompiler.get_options(self)
|
||||
fortran_stds = ['legacy', 'f95', 'f2003', 'f2008', 'f2018']
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'Fortran language standard to use',
|
||||
['none'] + fortran_stds,
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['legacy', 'f95', 'f2003', 'f2008', 'f2018'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
@ -367,14 +365,7 @@ class IntelClFortranCompiler(IntelVisualStudioLikeCompiler, FortranCompiler):
|
|||
|
||||
def get_options(self) -> 'OptionDictType':
|
||||
opts = FortranCompiler.get_options(self)
|
||||
fortran_stds = ['legacy', 'f95', 'f2003', 'f2008', 'f2018']
|
||||
opts.update({
|
||||
'std': coredata.UserComboOption(
|
||||
'Fortran language standard to use',
|
||||
['none'] + fortran_stds,
|
||||
'none',
|
||||
),
|
||||
})
|
||||
opts['std'].choices = ['legacy', 'f95', 'f2003', 'f2008', 'f2018'] # type: ignore
|
||||
return opts
|
||||
|
||||
def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]:
|
||||
|
|
|
|||
Loading…
Reference in New Issue