aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2017-05-04 17:53:04 +1000
committerJussi Pakkanen <jpakkane@gmail.com>2017-05-04 22:09:27 +0300
commitca924451ac257d4b410d5da33d9354d195490237 (patch)
treee4ce98c8f8ba4a9b0cc00ebdf98de8672be82de5 /mesonbuild
parentfe85721e7e97260b24da3911b4265535116b55cd (diff)
downloadmeson-ca924451ac257d4b410d5da33d9354d195490237.zip
meson-ca924451ac257d4b410d5da33d9354d195490237.tar.gz
meson-ca924451ac257d4b410d5da33d9354d195490237.tar.bz2
Use American English: behaviour -> behavior
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/ninjabackend.py2
-rw-r--r--mesonbuild/compilers.py2
-rw-r--r--mesonbuild/scripts/depfixer.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index fd6489c..88bd7ca 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2375,7 +2375,7 @@ rule FORTRAN_DEP_HACK
cmds.append('-D' + k + '=' + (v.value if isinstance(v.value, str) else str(v.value).lower()))
# The order of these arguments must be the same between runs of Meson
# to ensure reproducible output. The order we pass them shouldn't
- # affect behaviour in any other way.
+ # affect behavior in any other way.
return sorted(cmds)
# For things like scan-build and other helper tools we might have.
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index ba0fb4e..3d2cd96 100644
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -761,7 +761,7 @@ class CCompiler(Compiler):
def split_shlib_to_parts(self, fname):
return None, fname
- # The default behaviour is this, override in
+ # The default behavior is this, override in
# OSX and MSVC.
def build_rpath_args(self, build_dir, rpath_paths, install_rpath):
return build_unix_rpath_args(build_dir, rpath_paths, install_rpath)
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index fa76a95..2de50ba 100644
--- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
@@ -303,7 +303,7 @@ class Elf(DataSizes):
# completely unrelated. This has already happened once with X.org.
# Thus we want to keep this change as small as possible to minimize
# the chance of obliterating other strings. It might still happen
- # but our behaviour is identical to what chrpath does and it has
+ # but our behavior is identical to what chrpath does and it has
# been in use for ages so based on that this should be rare.
if not new_rpath:
self.remove_rpath_entry(entrynum)