From 435db359622ca6507a087b6bdcb2a977b3d3b8a4 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 11 Aug 2020 10:53:36 -0400 Subject: interpreter: Don't force fallback when subproject failed to configure Fixes: #7534 --- mesonbuild/interpreter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 429c9bb..2af08ec 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3671,7 +3671,8 @@ external dependencies (including libraries) must go to "dependencies".''') # a higher level project, try to use it first. if has_fallback: dirname, varname = self.get_subproject_infos(kwargs) - if dirname in self.subprojects: + sub = self.subprojects.get(dirname) + if sub and sub.found(): return self.get_subproject_dep(name, display_name, dirname, varname, kwargs) wrap_mode = self.coredata.get_builtin_option('wrap_mode') -- cgit v1.1