From b510d644feb8e0268236f0871a96c1ae86de5cab Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 2 Jul 2020 22:58:13 -0400 Subject: find_program: Do not use fallback when before parsing project() Mesa is doing `project(... find_program() ...)` so environment.wrap_resolver is not defined yet. --- mesonbuild/interpreter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 633615d..11dac38 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3364,7 +3364,7 @@ external dependencies (including libraries) must go to "dependencies".''') fallback = None wrap_mode = self.coredata.get_builtin_option('wrap_mode') - if wrap_mode != WrapMode.nofallback: + if wrap_mode != WrapMode.nofallback and self.environment.wrap_resolver: fallback = self.environment.wrap_resolver.find_program_provider(args) if fallback and wrap_mode == WrapMode.forcefallback: return self.find_program_fallback(fallback, args, required, extra_info) -- cgit v1.1