Merge pull request #2690 from jsoref/spelling

Spelling

7 files changed, 21 insertions, 21 deletions

diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 61f7535..d613f50 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -444,9 +444,9 @@ class Backend:
         copt_proxy = OptionOverrideProxy(target.option_overrides, self.environment.coredata.compiler_options)
         # First, the trivial ones that are impossible to override.
         #
-        # Add -nostdinc/-nostdinc++ if needed; can't be overriden
+        # Add -nostdinc/-nostdinc++ if needed; can't be overridden
         commands += self.get_cross_stdlib_args(target, compiler)
-        # Add things like /NOLOGO or -pipe; usually can't be overriden
+        # Add things like /NOLOGO or -pipe; usually can't be overridden
         commands += compiler.get_always_args()
         # Only add warning-flags by default if the buildtype enables it, and if
         # we weren't explicitly asked to not emit warnings (for Vala, f.ex)
@@ -568,7 +568,7 @@ class Backend:
             if isinstance(exe, build.BuildTarget):
                 is_cross = is_cross and exe.is_cross
             if isinstance(exe, dependencies.ExternalProgram):
-                # E.g. an external verificator or simulator program run on a generated executable.
+                # E.g. an external verifier or simulator program run on a generated executable.
                 # Can always be run.
                 is_cross = False
             if is_cross:
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index cea1b08..bcda603 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -220,7 +220,7 @@ int dummy;
             outfile.write('# Suffix\n\n')
             self.generate_utils(outfile)
             self.generate_ending(outfile)
-        # Only ovewrite the old build file after the new one has been
+        # Only overwrite the old build file after the new one has been
         # fully created.
         os.replace(tempfilename, outfilename)
         self.generate_compdb()
@@ -2236,7 +2236,7 @@ rule FORTRAN_DEP_HACK
     # Fortran is a bit weird (again). When you link against a library, just compiling a source file
     # requires the mod files that are output when single files are built. To do this right we would need to
     # scan all inputs and write out explicit deps for each file. That is stoo slow and too much effort so
-    # instead just have an ordered dependendy on the library. This ensures all required mod files are created.
+    # instead just have an ordered dependency on the library. This ensures all required mod files are created.
     # The real deps are then detected via dep file generation from the compiler. This breaks on compilers that
     # produce incorrect dep files but such is life.
     def get_fortran_orderdeps(self, target, compiler):
@@ -2387,9 +2387,9 @@ rule FORTRAN_DEP_HACK
             commands += compilers.get_base_link_args(self.environment.coredata.base_options,
                                                      linker,
                                                      isinstance(target, build.SharedModule))
-        # Add -nostdlib if needed; can't be overriden
+        # Add -nostdlib if needed; can't be overridden
         commands += self.get_cross_stdlib_link_args(target, linker)
-        # Add things like /NOLOGO; usually can't be overriden
+        # Add things like /NOLOGO; usually can't be overridden
         commands += linker.get_linker_always_args()
         # Add buildtype linker args: optimization level, etc.
         commands += linker.get_buildtype_linker_args(self.get_option_for_target('buildtype', target))
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 5f552c2..8eb95dc 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -1137,7 +1137,7 @@ class GeneratedList:
 class Executable(BuildTarget):
     def __init__(self, name, subdir, subproject, is_cross, sources, objects, environment, kwargs):
         super().__init__(name, subdir, subproject, is_cross, sources, objects, environment, kwargs)
-        # Unless overriden, executables have no suffix or prefix. Except on
+        # Unless overridden, executables have no suffix or prefix. Except on
         # Windows and with C#/Mono executables where the suffix is 'exe'
         if not hasattr(self, 'prefix'):
             self.prefix = ''
@@ -1746,7 +1746,7 @@ class Jar(BuildTarget):
 
 class CustomTargetIndex:
 
-    """A special opaque object returned by indexing a CustomTaget. This object
+    """A special opaque object returned by indexing a CustomTarget. This object
     exists in meson, but acts as a proxy in the backends, making targets depend
     on the CustomTarget it's derived from, but only adding one source file to
     the sources.
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 032ca69..7087b3e 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -451,9 +451,9 @@ class CompilerArgs(list):
         Returns whether the argument can be safely de-duped. This is dependent
         on three things:
 
-        a) Whether an argument can be 'overriden' by a later argument.  For
+        a) Whether an argument can be 'overridden' by a later argument.  For
            example, -DFOO defines FOO and -UFOO undefines FOO. In this case, we
-           can safely remove the previous occurance and add a new one. The same
+           can safely remove the previous occurrence and add a new one. The same
            is true for include paths and library paths with -I and -L. For
            these we return `2`. See `dedup2_prefixes` and `dedup2_args`.
         b) Arguments that once specified cannot be undone, such as `-c` or
@@ -511,10 +511,10 @@ class CompilerArgs(list):
                     continue
                 i = self.index(each)
                 if group_start < 0:
-                    # First occurance of a library
+                    # First occurrence of a library
                     group_start = i
             if group_start >= 0:
-                # Last occurance of a library
+                # Last occurrence of a library
                 self.insert(i + 1, '-Wl,--end-group')
                 self.insert(group_start, '-Wl,--start-group')
         return self.compiler.unix_args_to_native(self)
@@ -548,15 +548,15 @@ class CompilerArgs(list):
             raise TypeError('can only concatenate list (not "{}") to list'.format(args))
         for arg in args:
             # If the argument can be de-duped, do it either by removing the
-            # previous occurance of it and adding a new one, or not adding the
-            # new occurance.
+            # previous occurrence of it and adding a new one, or not adding the
+            # new occurrence.
             dedup = self._can_dedup(arg)
             if dedup == 1:
                 # Argument already exists and adding a new instance is useless
                 if arg in self or arg in pre or arg in post:
                     continue
             if dedup == 2:
-                # Remove all previous occurances of the arg and add it anew
+                # Remove all previous occurrences of the arg and add it anew
                 if arg in self:
                     self.remove(arg)
                 if arg in pre:
@@ -605,7 +605,7 @@ class Compiler:
             self.exelist = exelist
         else:
             raise TypeError('Unknown argument to Compiler')
-        # In case it's been overriden by a child class already
+        # In case it's been overridden by a child class already
         if not hasattr(self, 'file_suffixes'):
             self.file_suffixes = lang_suffixes[self.language]
         if not hasattr(self, 'can_compile_suffixes'):
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index 257bf7a..a161495 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -116,7 +116,7 @@ class LLVMDependency(ExternalDependency):
     """
 
     # Ordered list of llvm-config binaries to try. Start with base, then try
-    # newest back to oldest (3.5 is abitrary), and finally the devel version.
+    # newest back to oldest (3.5 is arbitrary), and finally the devel version.
     # Please note that llvm-config-6.0 is a development snapshot and it should
     # not be moved to the beginning of the list. The only difference between
     # llvm-config-6.0 and llvm-config-devel is that the former is used by
@@ -168,7 +168,7 @@ class LLVMDependency(ExternalDependency):
         mlog.log('Dependency LLVM found:', mlog.green('YES'))
         self.is_found = True
 
-        # Currently meson doesn't really atempt to handle pre-release versions,
+        # Currently meson doesn't really attempt to handle pre-release versions,
         # so strip the 'svn' off the end, since it will probably cuase problems
         # for users who want the patch version.
         self.version = out.strip().rstrip('svn')
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 58cc9b9..0cb1450 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -154,7 +154,7 @@ def detect_windows_arch(compilers):
         # Check if we're using and inside an MSVC toolchain environment
         if compiler.id == 'msvc' and 'VCINSTALLDIR' in os.environ:
             # 'Platform' is only set when the target arch is not 'x86'.
-            # It's 'x64' when targetting x86_64 and 'arm' when targetting ARM.
+            # It's 'x64' when targeting x86_64 and 'arm' when targeting ARM.
             platform = os.environ.get('Platform', 'x86').lower()
             if platform == 'x86':
                 return platform
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py
index 09b0f12..747b9d1 100644
--- a/mesonbuild/mconf.py
+++ b/mesonbuild/mconf.py
@@ -51,7 +51,7 @@ class Conf:
         with open(self.coredata_file, 'wb') as f:
             pickle.dump(self.coredata, f)
         # We don't write the build file because any changes to it
-        # are erased when Meson is executed the next time, i.e. whne
+        # are erased when Meson is executed the next time, i.e. when
         # Ninja is run.
 
     def print_aligned(self, arr):