diff options
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 11 | ||||
| -rw-r--r-- | test cases/python/6 failing subproject/meson.build | 5 | ||||
| -rw-r--r-- | test cases/python/6 failing subproject/subprojects/bar/meson.build | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 42e9b70..b527115 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -222,7 +222,6 @@ class Interpreter(InterpreterBase, HoldableObject): subproject: str = '', subdir: str = '', subproject_dir: str = 'subprojects', - modules: T.Optional[T.Dict[str, T.Union[ExtensionModule, NewExtensionModule, NotFoundExtensionModule]]] = None, default_project_options: T.Optional[T.Dict[str, str]] = None, mock: bool = False, ast: T.Optional[mparser.CodeBlockNode] = None, @@ -235,10 +234,7 @@ class Interpreter(InterpreterBase, HoldableObject): self.coredata = self.environment.get_coredata() self.backend = backend self.summary = {} - if modules is None: - self.modules = {} - else: - self.modules = modules + self.modules = {} # Subproject directory is usually the name of the subproject, but can # be different for dependencies provided by wrap files. self.subproject_directory_name = subdir.split(os.path.sep)[-1] @@ -821,7 +817,10 @@ external dependencies (including libraries) must go to "dependencies".''') with mlog.nested(subp_name): new_build = self.build.copy() subi = Interpreter(new_build, self.backend, subp_name, subdir, self.subproject_dir, - self.modules, default_options, ast=ast, is_translated=is_translated) + default_options, ast=ast, is_translated=is_translated) + # Those lists are shared by all interpreters. That means that + # even if the subproject fails, any modification that the subproject + # made to those lists will affect the parent project. subi.subprojects = self.subprojects subi.modules = self.modules subi.holder_map = self.holder_map diff --git a/test cases/python/6 failing subproject/meson.build b/test cases/python/6 failing subproject/meson.build new file mode 100644 index 0000000..cc33a1c --- /dev/null +++ b/test cases/python/6 failing subproject/meson.build @@ -0,0 +1,5 @@ +project('foo', 'cpp') + +# Regression test for https://github.com/mesonbuild/meson/issues/9038 +dependency('bar', required: false, allow_fallback: true) +python = import('python').find_installation('python3').dependency() diff --git a/test cases/python/6 failing subproject/subprojects/bar/meson.build b/test cases/python/6 failing subproject/subprojects/bar/meson.build new file mode 100644 index 0000000..21431ca --- /dev/null +++ b/test cases/python/6 failing subproject/subprojects/bar/meson.build @@ -0,0 +1,4 @@ +project('bar', 'cpp') + +python = import('python').find_installation('python3') +dependency('nonexistant-dependency') |