summaryrefslogtreecommitdiff
path: root/mesonbuild/build.py
diff options
context:
space:
mode:
authorXavier Claessens <xclaessens@netflix.com>2025-10-12 10:20:47 -0400
committerXavier Claessens <xclaesse@gmail.com>2025-10-15 12:15:39 -0400
commitbd33265b04ca609afe6bb895453c5757bbbbb27d (patch)
tree03b87a92694d2f7821612f6405540cc0e044ab6d /mesonbuild/build.py
parent4795475595ef6b87074df9e38d09a3dff2690396 (diff)
downloadmeson-bd33265b04ca609afe6bb895453c5757bbbbb27d.tar.gz
Replace OverrideExecutable and OverrideProgram with LocalProgram
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r--mesonbuild/build.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 88666e9a9..3fee807d4 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -292,7 +292,7 @@ class Build:
self.stdlibs = PerMachine({}, {})
self.test_setups: T.Dict[str, TestSetup] = {}
self.test_setup_default_name = None
- self.find_overrides: T.Dict[str, T.Union[OverrideExecutable, programs.ExternalProgram, programs.OverrideProgram, LocalProgram]] = {}
+ self.find_overrides: T.Dict[str, T.Union[programs.ExternalProgram, LocalProgram]] = {}
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
@@ -3353,18 +3353,6 @@ class ConfigurationData(HoldableObject):
def keys(self) -> T.Iterator[str]:
return self.values.keys()
-class OverrideExecutable(Executable):
- def __init__(self, executable: Executable, version: str):
- self._executable = executable
- self._version = version
-
- def __getattr__(self, name: str) -> T.Any:
- _executable = object.__getattribute__(self, '_executable')
- return getattr(_executable, name)
-
- def get_version(self, interpreter: T.Optional[Interpreter] = None) -> str:
- return self._version
-
class LocalProgram(HoldableObject):
''' A wrapper for a program that may have build dependencies.'''
def __init__(self, program: T.Union[programs.ExternalProgram, Executable, CustomTarget, CustomTargetIndex], version: str,