diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-27 01:36:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-27 01:36:43 +0200 |
commit | 11f1fc913d32adfd15b4d65cb25f06183361781b (patch) | |
tree | 4ff0f989596d10839bf5d0bb0afccf6ca789ca25 /mesonbuild/backend/backends.py | |
parent | 4ca1e8638c3f2bc7411ddc930cc8c995c163bc1a (diff) | |
parent | 9775e2b40d5b51af0910c203228c7b9651b07caa (diff) | |
download | meson-11f1fc913d32adfd15b4d65cb25f06183361781b.zip meson-11f1fc913d32adfd15b4d65cb25f06183361781b.tar.gz meson-11f1fc913d32adfd15b4d65cb25f06183361781b.tar.bz2 |
Merge pull request #2690 from jsoref/spelling
Spelling
Diffstat (limited to 'mesonbuild/backend/backends.py')
-rw-r--r-- | mesonbuild/backend/backends.py | 6 |
1 files changed, 3 insertions, 3 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: |