build: move find_overrides away

Fixes: #15080
Signed-off-by: Paolo Bonzini <[email protected]>

Author: bonzini

mesonbuild/build.py

@@ -363,7 +363,6 @@ def __init__(self, environment: Environment):
         self.stdlibs = PerMachine({}, {})
         self.test_setups: T.Dict[str, TestSetup] = {}
         self.test_setup_default_name = None
-        self.find_overrides: T.Dict[str, programs.Program] = {}
         self.searched_programs: T.Set[str] = set() # The list of all programs that have been searched for.
 
         # If we are doing a cross build we need two caches, if we're doing a

mesonbuild/interpreter/interpreter.py

@@ -286,6 +286,7 @@ def __init__(
         self.build_func_dict()
         self.build_holder_map()
         self.user_defined_options = user_defined_options
+        self.find_overrides: T.Dict[str, Program] = {}
         self.compilers: PerMachine[T.Dict[str, 'compilers.Compiler']] = PerMachine({}, {})
         self.parse_project()
         self._redetect_machines()
@@ -761,7 +762,7 @@ def func_run_command(self, node: mparser.BaseNode,
 
     def _compiled_exe_error(self, cmd: T.Union[Program, build.Executable]) -> T.NoReturn:
         descr = cmd.name if isinstance(cmd, build.Executable) else cmd.description()
-        for name, exe in self.build.find_overrides.items():
+        for name, exe in self.find_overrides.items():
             if cmd == exe:
                 raise InterpreterException(f'Program {name!r} was overridden with the compiled executable {descr!r} and therefore cannot be used during configuration')
         raise InterpreterException(f'Program {descr!r} is a compiled executable and therefore cannot be used during configuration')
@@ -995,6 +996,7 @@ def _do_subproject_meson(self, subp_name: str, subdir: str,
             subi.holder_map = self.holder_map
             subi.bound_holder_map = self.bound_holder_map
             subi.summary = self.summary
+            subi.find_overrides = self.find_overrides
 
             subi.subproject_stack = self.subproject_stack + [subp_name]
             current_active = self.active_projectname
@@ -1591,8 +1593,8 @@ def program_from_overrides(self, command_names: T.List[mesonlib.FileOrString],
         for name in command_names:
             if not isinstance(name, str):
                 continue
-            if name in self.build.find_overrides:
-                exe = self.build.find_overrides[name]
+            if name in self.find_overrides:
+                exe = self.find_overrides[name]
                 extra_info.append(mlog.blue('(overridden)'))
                 return exe
         return None
@@ -1605,9 +1607,9 @@ def store_name_lookups(self, command_names: T.List[mesonlib.FileOrString]) -> No
     def add_find_program_override(self, name: str, exe: Program) -> None:
         if name in self.build.searched_programs:
             raise InterpreterException(f'Tried to override finding of executable "{name}" which has already been found.')
-        if name in self.build.find_overrides:
+        if name in self.find_overrides:
             raise InterpreterException(f'Tried to override executable "{name}" which has already been overridden.')
-        self.build.find_overrides[name] = exe
+        self.find_overrides[name] = exe
         if name == 'pkg-config' and isinstance(exe, ExternalProgram):
             from ..dependencies.pkgconfig import PkgConfigInterface
             PkgConfigInterface.set_program_override(exe, MachineChoice.HOST)