diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-09-29 10:11:30 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-11-12 10:03:14 -0800 |
| commit | a28a34c6845144d2e947bd698244fb33909b4d45 (patch) | |
| tree | 735e8094e820d3c1bb0d3ae5f5714f42cea415e6 /mesonbuild/compilers | |
| parent | 3e62307f3a5d184c8c331de2809d5eaa38f001fd (diff) | |
| download | meson-a28a34c6845144d2e947bd698244fb33909b4d45.zip meson-a28a34c6845144d2e947bd698244fb33909b4d45.tar.gz meson-a28a34c6845144d2e947bd698244fb33909b4d45.tar.bz2 | |
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
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/c.py | 18 | ||||
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 6 | ||||
| -rw-r--r-- | mesonbuild/compilers/cuda.py | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index fd3ebc0..c136c6d 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -615,9 +615,9 @@ class Xc16CCompiler(Xc16Compiler, CCompiler): def get_options(self) -> 'OptionDictType': opts = CCompiler.get_options(self) - opts.update({'c_std': coredata.UserComboOption('C language standard to use', - ['none', 'c89', 'c99', 'gnu89', 'gnu99'], - 'none')}) + opts.update({'std': coredata.UserComboOption('C language standard to use', + ['none', 'c89', 'c99', 'gnu89', 'gnu99'], + 'none')}) return opts def get_no_stdinc_args(self) -> T.List[str]: @@ -660,9 +660,9 @@ class CompCertCCompiler(CompCertCompiler, CCompiler): def get_options(self) -> 'OptionDictType': opts = CCompiler.get_options(self) - opts.update({'c_std': coredata.UserComboOption('C language standard to use', - ['none', 'c89', 'c99'], - 'none')}) + opts.update({'std': coredata.UserComboOption('C language standard to use', + ['none', 'c89', 'c99'], + 'none')}) return opts def get_option_compile_args(self, options: 'OptionDictType') -> T.List[str]: @@ -698,9 +698,9 @@ class C2000CCompiler(C2000Compiler, CCompiler): def get_options(self) -> 'OptionDictType': opts = CCompiler.get_options(self) - opts.update({'c_std': coredata.UserComboOption('C language standard to use', - ['none', 'c89', 'c99', 'c11'], - 'none')}) + opts.update({'std': coredata.UserComboOption('C language standard to use', + ['none', 'c89', 'c99', 'c11'], + 'none')}) return opts def get_no_stdinc_args(self) -> T.List[str]: diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 3e9764a..afc812a 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -790,9 +790,9 @@ class C2000CPPCompiler(C2000Compiler, CPPCompiler): def get_options(self) -> 'OptionDictType': opts = CPPCompiler.get_options(self) - opts.update({'cpp_std': coredata.UserComboOption('C++ language standard to use', - ['none', 'c++03'], - 'none')}) + opts.update({'std': coredata.UserComboOption('C++ language standard to use', + ['none', 'c++03'], + 'none')}) return opts def get_always_args(self) -> T.List[str]: diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index 603ad13..89fcf40 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -197,9 +197,9 @@ class CudaCompiler(Compiler): def get_options(self) -> 'OptionDictType': opts = super().get_options() - opts.update({'cuda_std': coredata.UserComboOption('C++ language standard to use', - ['none', 'c++03', 'c++11', 'c++14'], - 'none')}) + opts.update({'std': coredata.UserComboOption('C++ language standard to use with cuda', + ['none', 'c++03', 'c++11', 'c++14'], + 'none')}) return opts 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 # and attempting to use it will result in a warning: https://stackoverflow.com/a/51272091/741027 if not is_windows(): - std = options['cuda_std'] + std = options['std'] if std.value != 'none': args.append('--std=' + std.value) |