aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-08-25 23:22:07 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-08-25 23:22:07 +0300
commit44fa1ee86be848ce742629f7db5b4738b7b75c54 (patch)
tree2ff903c68c1ca74acbe855b9b964130d4116521c
parent9d559b2b39d4ba084ad479bfb3100b62c13c7d61 (diff)
parent3c23b192507d9047b2fc3aa711242139f61e77ad (diff)
downloadmeson-44fa1ee86be848ce742629f7db5b4738b7b75c54.zip
meson-44fa1ee86be848ce742629f7db5b4738b7b75c54.tar.gz
meson-44fa1ee86be848ce742629f7db5b4738b7b75c54.tar.bz2
Merge pull request #240 from thiblahute/master
Fix access to the pkgconfig path in CrossBuildInfo
-rw-r--r--dependencies.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/dependencies.py b/dependencies.py
index 7fed278..08fb864 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -87,9 +87,9 @@ class PkgConfigDependency(Dependency):
self.libs = []
return
if environment.is_cross_build() and want_cross:
- if "pkgconfig" not in environment.cross_info:
+ if "pkgconfig" not in environment.cross_info.config["binaries"]:
raise DependencyException('Pkg-config binary missing from cross file.')
- pkgbin = environment.cross_info['pkgconfig']
+ pkgbin = environment.cross_info.config["binaries"]['pkgconfig']
self.type_string = 'Cross'
else:
pkgbin = 'pkg-config'