diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-04-22 17:57:48 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-04-28 14:39:59 -0400 |
| commit | 707d3a2e20611466fcb6a8af7a977e5c3c989c25 (patch) | |
| tree | b4d872146df83125d650cd069ad66f26aa7e85bb /mesonbuild/interpreter.py | |
| parent | 30b89ea57307f09563db862b307e873cc1e7cfc3 (diff) | |
| download | meson-707d3a2e20611466fcb6a8af7a977e5c3c989c25.zip meson-707d3a2e20611466fcb6a8af7a977e5c3c989c25.tar.gz meson-707d3a2e20611466fcb6a8af7a977e5c3c989c25.tar.bz2 | |
gnome: Fix usage of gobject-introspection as subproject
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 5d9fcf7..6575868 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1801,6 +1801,11 @@ class ModuleHolder(InterpreterObject, ObjectHolder): target_machine=self.interpreter.builtin['target_machine'].held_object, current_node=self.current_node ) + # Many modules do for example self.interpreter.find_program_impl(), + # so we have to ensure they use the current interpreter and not the one + # that first imported that module, otherwise it will use outdated + # overrides. + self.held_object.interpreter = self.interpreter if self.held_object.is_snippet(method_name): value = fn(self.interpreter, state, args, kwargs) return self.interpreter.holderify(value) |