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 | |
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')
-rw-r--r-- | mesonbuild/backend/backends.py | 6 | ||||
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 8 |
2 files changed, 7 insertions, 7 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)) |