Skip to content

Commit 7bc0f99

Browse files
committed
interpreterobjects: remove was_returned_by_find_program
This is not needed anymore now that there is a proper LocalProgram object that find_program() returns. Signed-off-by: Paolo Bonzini <[email protected]>
1 parent f48ea1a commit 7bc0f99

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

mesonbuild/build.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2160,8 +2160,6 @@ def __init__(
21602160
self.implib_name = kwargs.get('implib')
21612161
# Only linkwithable if using export_dynamic
21622162
self.is_linkwithable = self.export_dynamic
2163-
# Remember that this exe was returned by `find_program()` through an override
2164-
self.was_returned_by_find_program = False
21652163

21662164
self.vs_module_defs: T.Optional[File] = None
21672165
self.process_vs_module_defs_kw(kwargs)

mesonbuild/interpreter/interpreter.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,8 +1647,6 @@ def find_program_impl(self, args: T.List[mesonlib.FileOrString],
16471647
self.store_name_lookups(args)
16481648
if not silent:
16491649
mlog.log('Program', mlog.bold(progobj.name), 'found:', mlog.green('YES'), *extra_info)
1650-
if isinstance(progobj, build.Executable):
1651-
progobj.was_returned_by_find_program = True
16521650
return progobj
16531651

16541652
def program_lookup(self, args: T.List[mesonlib.FileOrString], for_machine: MachineChoice,

mesonbuild/interpreter/interpreterobjects.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,9 +953,8 @@ def is_cross(self) -> bool:
953953
@noPosargs
954954
@noKwargs
955955
@InterpreterObject.method('found')
956+
@FeatureNew('BuildTarget.found', '0.59.0')
956957
def found_method(self, args: T.List[TYPE_var], kwargs: TYPE_kwargs) -> bool:
957-
if not (isinstance(self.held_object, build.Executable) and self.held_object.was_returned_by_find_program):
958-
FeatureNew.single_use('BuildTarget.found', '0.59.0', subproject=self.held_object.subproject)
959958
return True
960959

961960
@noPosargs

0 commit comments

Comments
 (0)