diff options
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/cuda.py | 4 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/emscripten.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/visualstudio.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 51ff55d..4623497 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -554,7 +554,7 @@ class CompilerArgs(list): default_dirs = self.compiler.get_default_include_dirs() bad_idx_list = [] for i, each in enumerate(new): - # Remove the -isystem and the path if the path is a dafault path + # Remove the -isystem and the path if the path is a default path if (each == '-isystem' and i < (len(new) - 1) and new[i + 1] in default_dirs): diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 973ffbb..67a26dc 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -552,7 +552,7 @@ class IntelClCPPCompiler(VisualStudioLikeCPPCompilerMixin, IntelVisualStudioLike IntelVisualStudioLikeCompiler.__init__(self, target) def get_options(self): - # This has only been tested with verison 19.0, + # This has only been tested with version 19.0, cpp_stds = ['none', 'c++11', 'vc++11', 'c++14', 'vc++14', 'c++17', 'vc++17', 'c++latest'] return self._get_options_impl(super().get_options(), cpp_stds) diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index 088a7e7..4ca8f4e 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -157,7 +157,7 @@ class CudaCompiler(Compiler): raise EnvironmentException('Executables created by {0} compiler {1} are not runnable.'.format(self.language, self.name_string())) # Interpret the result of the sanity test. - # As mentionned above, it is not only a sanity test but also a GPU + # As mentioned above, it is not only a sanity test but also a GPU # architecture detection test. if stde == '': self.detected_cc = stdo @@ -191,7 +191,7 @@ class CudaCompiler(Compiler): def get_option_compile_args(self, options): args = [] # On Windows, the version of the C++ standard used by nvcc is dictated by - # the combination of CUDA version and MSVC verion; 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 if not is_windows(): std = options['cuda_std'] diff --git a/mesonbuild/compilers/mixins/emscripten.py b/mesonbuild/compilers/mixins/emscripten.py index 4797cbc..98513e5 100644 --- a/mesonbuild/compilers/mixins/emscripten.py +++ b/mesonbuild/compilers/mixins/emscripten.py @@ -37,7 +37,7 @@ class EmscriptenMixin: if mode == 'preprocess': return None # Unlike sane toolchains, emcc infers the kind of output from its name. - # This is the only reason why this method is overriden; compiler tests + # This is the only reason why this method is overridden; compiler tests # do not work well with the default exe/obj suffices. if mode == 'link': suffix = 'js' diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py index ebf51ff..60b07c4 100644 --- a/mesonbuild/compilers/mixins/visualstudio.py +++ b/mesonbuild/compilers/mixins/visualstudio.py @@ -83,7 +83,7 @@ class VisualStudioLikeCompiler(metaclass=abc.ABCMeta): A number of compilers attempt to mimic MSVC, with varying levels of success, such as Clang-CL and ICL (the Intel C/C++ Compiler for Windows). - This classs implements as much common logic as possible. + This class implements as much common logic as possible. """ std_warn_args = ['/W3'] |