diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-05-09 11:54:09 +0200 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2025-05-15 02:05:18 -0400 |
| commit | 2f6fc30df10583c77dc1318f2fb62111de3e121c (patch) | |
| tree | 2e559b1ecdb8e45868703bd02b020bdfa2a386ac | |
| parent | d8defe8ecdc5bca03acc269c11afe9db7ed6d454 (diff) | |
| download | meson-2f6fc30df10583c77dc1318f2fb62111de3e121c.tar.gz | |
msetup: update coredata if options are passed together with --reconfigure
This makes "meson setup --reconfigure" behave quite literally the same as
"meson configure" + "meson setup"; except that saving coredata and
cmdline file is delayed until the setup succeeds.
Fixes: #14575
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | mesonbuild/msetup.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 81dd18330..c8770fd93 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -180,6 +180,9 @@ class MesonApp: # See class Backend's 'generate' for comments on capture args and returned dictionary. def generate(self, capture: bool = False, vslite_ctx: T.Optional[dict] = None) -> T.Optional[dict]: env = environment.Environment(self.source_dir, self.build_dir, self.options) + if not env.first_invocation: + assert self.options.reconfigure + env.coredata.set_from_configure_command(self.options) mlog.initialize(env.get_log_dir(), self.options.fatal_warnings) if self.options.profile: mlog.set_timestamp_start(time.monotonic()) |