From 2fe07adc0eee3920f825b536bf053ab3788cdaef Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 16 Aug 2022 23:39:37 -0400 Subject: [PATCH] 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. --- mesonbuild/mesonmain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 37b2502c3..84555fc95 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:])