diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2019-04-12 02:07:15 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-04-13 04:30:59 +0000 |
| commit | eaed4aecbe218018feed73192e6fc25e54034d53 (patch) | |
| tree | 5c21f9c008876e1414e7c206f53f5d912f054d91 /mesonbuild/msetup.py | |
| parent | e9b4344aee3d09aec669eda8e63a595a1161c160 (diff) | |
| download | meson-eaed4aecbe218018feed73192e6fc25e54034d53.zip meson-eaed4aecbe218018feed73192e6fc25e54034d53.tar.gz meson-eaed4aecbe218018feed73192e6fc25e54034d53.tar.bz2 | |
Run postconf scripts absolutely last.
Introspection is broken if they are run any earlier.
Diffstat (limited to 'mesonbuild/msetup.py')
| -rw-r--r-- | mesonbuild/msetup.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index ef0511d..563b811 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(): |