aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorAli Alnubani <alialnu@nvidia.com>2021-01-31 18:33:54 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2021-02-03 15:30:10 +0000
commita174855200ee0fd42bb3d23374a9d018b1888948 (patch)
tree58e54abb22da93621db15eeb142170c8f5d7c98b /mesonbuild/environment.py
parentcd94cf8995bcddc40e627e94037e549b7a18b20e (diff)
downloadmeson-a174855200ee0fd42bb3d23374a9d018b1888948.zip
meson-a174855200ee0fd42bb3d23374a9d018b1888948.tar.gz
meson-a174855200ee0fd42bb3d23374a9d018b1888948.tar.bz2
environment: fix typos
Fixed typos and reworded some sentences. Signed-off-by: Ali Alnubani <alialnu@nvidia.com>
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 219b0f2..b12728b 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -1006,7 +1006,7 @@ class Environment:
def _handle_exceptions(self, exceptions, binaries, bintype='compiler'):
errmsg = 'Unknown {}(s): {}'.format(bintype, binaries)
if exceptions:
- errmsg += '\nThe follow exceptions were encountered:'
+ errmsg += '\nThe following exception(s) were encountered:'
for (c, e) in exceptions.items():
errmsg += '\nRunning "{0}" gave "{1}"'.format(c, e)
raise EnvironmentException(errmsg)
@@ -1778,8 +1778,8 @@ class Environment:
mlog.warning(
'Please do not put -C linker= in your compiler '
'command, set rust_ld=command in your cross file '
- 'or use the RUST_LD environment variable. meson '
- 'will override your seletion otherwise.')
+ 'or use the RUST_LD environment variable, otherwise meson '
+ 'will override your selection.')
if override is None:
extra_args = {}
@@ -1818,7 +1818,7 @@ class Environment:
else:
# On linux and macos rust will invoke the c compiler for
# linking, on windows it will use lld-link or link.exe.
- # we will simply ask for the C compiler that coresponds to
+ # we will simply ask for the C compiler that corresponds to
# it, and use that.
cc = self._detect_c_or_cpp_compiler('c', for_machine, override_compiler=override)
linker = cc.linker