diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2019-04-12 02:07:15 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-04-17 00:05:54 +0530 |
| commit | 29861cb084b9bf86bea9f296af5a93e74a7db800 (patch) | |
| tree | 08ebef96bb4d7b4f6782b981117ff5b155a58ed2 | |
| parent | 4c73eda9d55501d53ce108a708662e8fe06b5cf8 (diff) | |
| download | meson-29861cb084b9bf86bea9f296af5a93e74a7db800.zip meson-29861cb084b9bf86bea9f296af5a93e74a7db800.tar.gz meson-29861cb084b9bf86bea9f296af5a93e74a7db800.tar.bz2 | |
Run postconf scripts absolutely last.
Introspection is broken if they are run any earlier.
| -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 023afdb..8a0bff5 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -215,8 +215,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: @@ -229,6 +227,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(): |