From 06b76f7c9d7bbe74450ed49316eaeae28dccda7d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 29 Mar 2022 13:43:59 +0200 Subject: dependencies: extract code to get all leaf dependencies Extract to a separate function the code that resolves dependencies for compiler methods. We will reuse it for add_project_dependencies(). Signed-off-by: Paolo Bonzini --- mesonbuild/interpreter/compiler.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'mesonbuild/interpreter') diff --git a/mesonbuild/interpreter/compiler.py b/mesonbuild/interpreter/compiler.py index 9dc6544..185d151 100644 --- a/mesonbuild/interpreter/compiler.py +++ b/mesonbuild/interpreter/compiler.py @@ -239,20 +239,7 @@ class CompilerHolder(ObjectHolder['Compiler']): return args def _determine_dependencies(self, deps: T.List['dependencies.Dependency'], endl: str = ':') -> T.Tuple[T.List['dependencies.Dependency'], str]: - if deps: - final_deps = [] - while deps: - next_deps = [] - for d in mesonlib.listify(deps): - if not isinstance(d, dependencies.Dependency) or d.is_built(): - raise InterpreterException('Dependencies must be external dependencies') - final_deps.append(d) - next_deps.extend(d.ext_deps) - deps = next_deps - deps = final_deps - else: - # Ensure that we always return a new instance - deps = deps.copy() + deps = dependencies.get_leaf_external_dependencies(deps) return deps, self._dep_msg(deps, endl) @typed_pos_args('compiler.alignment', str) -- cgit v1.1