diff options
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/c.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 6 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 4a55b46..c11319b 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -98,7 +98,7 @@ class CCompiler(CLikeCompiler, Compiler): opts = super().get_options() opts.update({ OptionKey('std', machine=self.for_machine, lang=self.language): coredata.UserComboOption( - 'C langauge standard to use', + 'C language standard to use', ['none'], 'none', ) diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index cf9f35b..0f83f4c 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -69,7 +69,7 @@ all_languages = lang_suffixes.keys() cpp_suffixes = lang_suffixes['cpp'] + ('h',) # type: T.Tuple[str, ...] c_suffixes = lang_suffixes['c'] + ('h',) # type: T.Tuple[str, ...] # List of languages that by default consume and output libraries following the -# C ABI; these can generally be used interchangebly +# C ABI; these can generally be used interchangeably clib_langs = ('objcpp', 'cpp', 'objc', 'c', 'fortran',) # type: T.Tuple[str, ...] # List of languages that can be linked with C code directly by the linker # used in build.py:process_compilers() and build.py:get_dynamic_linker() @@ -1199,14 +1199,14 @@ def get_global_options(lang: str, comp: T.Type[Compiler], for_machine: MachineChoice, env: 'Environment') -> 'KeyedOptionDictType': - """Retreive options that apply to all compilers for a given language.""" + """Retrieve options that apply to all compilers for a given language.""" description = 'Extra arguments passed to the {}'.format(lang) argkey = OptionKey('args', lang=lang, machine=for_machine) largkey = argkey.evolve('link_args') # We shouldn't need listify here, but until we have a separate # linker-driver representation and can have that do the combine we have to - # do it htis way. + # do it this way. compile_args = mesonlib.listify(env.options.get(argkey, [])) link_args = mesonlib.listify(env.options.get(largkey, [])) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 3288c00..ad3bfae 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -236,7 +236,7 @@ class CLikeCompiler(Compiler): retval.append(d) # at this point, it's an ELF file which doesn't match the # appropriate elf_class, so skip this one - # stop scanning after the first sucessful read + # stop scanning after the first successful read break except OSError: # Skip the file if we can't read it @@ -1271,7 +1271,7 @@ class CLikeCompiler(Compiler): def get_has_func_attribute_extra_args(self, name: str) -> T.List[str]: # Most compilers (such as GCC and Clang) only warn about unknown or - # ignored attributes, so force an error. Overriden in GCC and Clang + # ignored attributes, so force an error. Overridden in GCC and Clang # mixins. return ['-Werror'] |