Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not cache found programs because it is unreliable. Closes #374.

This commit is contained in:
Jussi Pakkanen 2016-02-12 23:15:44 +02:00
parent 72a94c13f2
commit fc08f60b9f
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mesonbuild/coredata.py
View File

@ -154,7 +154,6 @@ class CoreData():
self.compilers = {}
self.cross_compilers = {}
self.deps = {}
self.ext_progs = {}
self.modules = {}
def init_builtins(self, options):

6
mesonbuild/interpreter.py
View File

@ -1497,14 +1497,12 @@ class Interpreter():
if not isinstance(required, bool):
raise InvalidArguments('"required" argument must be a boolean.')
exename = args[0]
if exename in self.coredata.ext_progs and\
self.coredata.ext_progs[exename].found():
return ExternalProgramHolder(self.coredata.ext_progs[exename])
# Search for scripts relative to current subdir.
# Do not cache found programs because find_program('foobar')
# might give different results when run from different source dirs.
search_dir = os.path.join(self.environment.get_source_dir(), self.subdir)
extprog = dependencies.ExternalProgram(exename, search_dir=search_dir)
progobj = ExternalProgramHolder(extprog)
self.coredata.ext_progs[exename] = extprog
if required and not progobj.found():
raise InvalidArguments('Program "%s" not found.' % exename)
return progobj