From eaed4aecbe218018feed73192e6fc25e54034d53 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 12 Apr 2019 02:07:15 -0400 Subject: [PATCH] Run postconf scripts absolutely last. Introspection is broken if they are run any earlier. --- mesonbuild/msetup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index ef0511dd2..563b81120 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -209,8 +209,6 @@ class MesonApp: else: intr.backend.generate(intr) build.save(b, dumpfile) - # Post-conf scripts must be run after writing coredata or else introspection fails. - intr.backend.run_postconf_scripts() if env.first_invocation: coredata.write_cmd_line_file(self.build_dir, self.options) else: @@ -223,6 +221,9 @@ class MesonApp: else: mintro.generate_introspection_file(b, intr.backend) mintro.write_meson_info_file(b, [], True) + + # Post-conf scripts must be run after writing coredata or else introspection fails. + intr.backend.run_postconf_scripts() except Exception as e: mintro.write_meson_info_file(b, [e]) if 'cdf' in locals():