diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-04-01 14:58:22 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-04-01 14:58:22 +0300 |
commit | 3d4aad9e0d0038061960469d4d380b7e57d53144 (patch) | |
tree | 5aea5bc253987766f1e28b64f47359c06e47b039 /interpreter.py | |
parent | 137365b5b3f5169f16106792a8f8e01bca1c181a (diff) | |
download | meson-3d4aad9e0d0038061960469d4d380b7e57d53144.zip meson-3d4aad9e0d0038061960469d4d380b7e57d53144.tar.gz meson-3d4aad9e0d0038061960469d4d380b7e57d53144.tar.bz2 |
Can have multiple different configurations of the same dependency.
Diffstat (limited to 'interpreter.py')
-rwxr-xr-x | interpreter.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/interpreter.py b/interpreter.py index 5b32cc7..091ec78 100755 --- a/interpreter.py +++ b/interpreter.py @@ -680,13 +680,14 @@ class Interpreter(): def func_find_dep(self, node, args, kwargs): self.validate_arguments(args, 1, [str]) name = args[0] - if name in self.coredata.deps: - dep = self.coredata.deps[name] + identifier = dependencies.get_dep_identifier(name, kwargs) + if identifier in self.coredata.deps: + dep = self.coredata.deps[identifier] else: dep = dependencies.Dependency() # Returns always false for dep.found() if not dep.found(): dep = dependencies.find_external_dependency(name, kwargs) - self.coredata.deps[name] = dep + self.coredata.deps[identifier] = dep return dep def func_executable(self, node, args, kwargs): |