aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-08-16 23:39:37 -0400
committerEli Schwartz <eschwartz@archlinux.org>2022-08-16 23:39:37 -0400
commit2fe07adc0eee3920f825b536bf053ab3788cdaef (patch)
tree9dff696365f681fad6a940570d8584e2c35e158c
parent3c7ab542c0c4770241eae149b0d4cd8de329aee0 (diff)
downloadmeson-2fe07adc0eee3920f825b536bf053ab3788cdaef.zip
meson-2fe07adc0eee3920f825b536bf053ab3788cdaef.tar.gz
meson-2fe07adc0eee3920f825b536bf053ab3788cdaef.tar.bz2
fixup! deprecate running "meson builddir" without setup subcommand
Also pass the setup command when rewriting --internal regenerate. This avoids the issue where `ninja` triggers a reconfigure, and this warning gets printed as a side effect.
-rw-r--r--mesonbuild/mesonmain.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 37b2502..84555fc 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -255,7 +255,7 @@ def run(original_args, mainfile):
if args[1] == 'regenerate':
# Rewrite "meson --internal regenerate" command line to
# "meson --reconfigure"
- args = ['--reconfigure'] + args[2:]
+ args = ['setup', '--reconfigure'] + args[2:]
else:
return run_script_command(args[1], args[2:])