aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-08-22 00:22:25 -0400
committerEli Schwartz <eschwartz@archlinux.org>2022-08-22 00:23:14 -0400
commitd395b1a7682cdc9387b452fd2904d394eb1c0cd2 (patch)
treec6e42872b005a1e442ba3da039d3aa7c21c61ebf /mesonbuild
parenta572734330b788de4a7bdfd8f64cbc01b0fe37b0 (diff)
downloadmeson-d395b1a7682cdc9387b452fd2904d394eb1c0cd2.zip
meson-d395b1a7682cdc9387b452fd2904d394eb1c0cd2.tar.gz
meson-d395b1a7682cdc9387b452fd2904d394eb1c0cd2.tar.bz2
fix up some message strings that don't include "setup" in the configure command
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/build.py2
-rw-r--r--mesonbuild/msetup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 6f5c9bb..2729373 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -2917,7 +2917,7 @@ def load(build_dir: str) -> Build:
f"Build data file {filename!r} references functions or classes that don't "
"exist. This probably means that it was generated with an old "
"version of meson. Try running from the source directory "
- f"meson {build_dir} --wipe")
+ f"meson setup {build_dir} --wipe")
if not isinstance(obj, Build):
raise MesonException(load_fail_msg)
return obj
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py
index 2a15e13..7fa18af 100644
--- a/mesonbuild/msetup.py
+++ b/mesonbuild/msetup.py
@@ -165,7 +165,7 @@ class MesonApp:
if not reconfigure and not wipe:
print('Directory already configured.\n'
'\nJust run your build command (e.g. ninja) and Meson will regenerate as necessary.\n'
- 'If ninja fails, run "ninja reconfigure" or "meson --reconfigure"\n'
+ 'If ninja fails, run "ninja reconfigure" or "meson setup --reconfigure"\n'
'to force Meson to regenerate.\n'
'\nIf build failures persist, run "meson setup --wipe" to rebuild from scratch\n'
'using the same options as passed when configuring the build.'