aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Soref <jsoref@users.noreply.github.com>2017-11-26 05:55:40 +0000
committerJosh Soref <jsoref@users.noreply.github.com>2017-11-26 05:55:40 +0000
commit49f8d28ef5dad5714b9837e6bace31c454b751b0 (patch)
tree636568fe5f799c2bcf3ebbba776483a42b81efca
parent9dd4f047af292af8f46558d52fb1bcee74207553 (diff)
downloadmeson-49f8d28ef5dad5714b9837e6bace31c454b751b0.zip
meson-49f8d28ef5dad5714b9837e6bace31c454b751b0.tar.gz
meson-49f8d28ef5dad5714b9837e6bace31c454b751b0.tar.bz2
spelling: overridden
-rw-r--r--mesonbuild/backend/backends.py4
-rw-r--r--mesonbuild/backend/ninjabackend.py4
-rw-r--r--mesonbuild/build.py2
-rw-r--r--mesonbuild/compilers/compilers.py4
-rwxr-xr-xrun_unittests.py2
-rw-r--r--test cases/common/66 install subdir/subdir/meson.build2
6 files changed, 9 insertions, 9 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 61f7535..b6aa0ee 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)
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 6eb8e13..72bad29 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -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..d38f4d4 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 = ''
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 7f6a181..7087b3e 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -451,7 +451,7 @@ 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 occurrence and add a new one. The same
is true for include paths and library paths with -I and -L. For
@@ -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/run_unittests.py b/run_unittests.py
index fe75074..be5ce47 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1958,7 +1958,7 @@ class LinuxlikeTests(BasePlatformTests):
# Verify that -I flags from the `args` kwarg are first
# This is set in the '43 has function' test case
self.assertEqual(cmd[1], '-I/tmp')
- # Verify that -O3 set via the environment is overriden by -O0
+ # Verify that -O3 set via the environment is overridden by -O0
Oargs = [arg for arg in cmd if arg.startswith('-O')]
self.assertEqual(Oargs, [Oflag, '-O0'])
diff --git a/test cases/common/66 install subdir/subdir/meson.build b/test cases/common/66 install subdir/subdir/meson.build
index 37d2da4..a1dadd4 100644
--- a/test cases/common/66 install subdir/subdir/meson.build
+++ b/test cases/common/66 install subdir/subdir/meson.build
@@ -1,3 +1,3 @@
install_subdir('sub1', install_dir : 'share',
- # This mode will be overriden by the mode set in the outer install_subdir
+ # This mode will be overridden by the mode set in the outer install_subdir
install_mode : 'rwxr-x---')