spelling: overridden

pull/2690/head
Josh Soref 7 years ago
parent 9dd4f047af
commit 49f8d28ef5
  1. 4
      mesonbuild/backend/backends.py
  2. 4
      mesonbuild/backend/ninjabackend.py
  3. 2
      mesonbuild/build.py
  4. 4
      mesonbuild/compilers/compilers.py
  5. 2
      run_unittests.py
  6. 2
      test cases/common/66 install subdir/subdir/meson.build

@ -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)

@ -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))

@ -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 = ''

@ -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'):

@ -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'])

@ -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---')

Loading…
Cancel
Save