aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2016-12-19 01:20:56 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2016-12-19 14:07:25 +0200
commitf9c1cc9d93e2a614b9d8510ba022865183cfbfc1 (patch)
tree43a0e4d30789d0a2d3acc8d2874c5df882be7a71
parent51e6a3986a1385b325545133f59fbbf8fdfd5a38 (diff)
downloadmeson-f9c1cc9d93e2a614b9d8510ba022865183cfbfc1.zip
meson-f9c1cc9d93e2a614b9d8510ba022865183cfbfc1.tar.gz
meson-f9c1cc9d93e2a614b9d8510ba022865183cfbfc1.tar.bz2
Fix pkg-config during cross-compile.
-rw-r--r--mesonbuild/dependencies.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
index 20556e2..aa3927f 100644
--- a/mesonbuild/dependencies.py
+++ b/mesonbuild/dependencies.py
@@ -113,11 +113,11 @@ class PkgConfigDependency(Dependency):
# When finding dependencies for cross-compiling, we don't care about
# the 'native' pkg-config
if want_cross:
- if 'pkgconfig' not in env.cross_info.config['binaries']:
+ if 'pkgconfig' not in environment.cross_info.config['binaries']:
if self.required:
raise DependencyException('Pkg-config binary missing from cross file')
else:
- pkgbin = environment.cross_info.config['binaries']['pkgconfig']
+ PkgConfigDependency.pkgbin = environment.cross_info.config['binaries']['pkgconfig']
# Only search for the native pkg-config the first time and
# store the result in the class definition
elif PkgConfigDependency.pkgbin is None: