diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-09 21:48:27 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-09 21:48:27 +0300 |
commit | f9910d2c113e4d593dc1fe4099c52dc3fb828c9c (patch) | |
tree | cfd814b8c74da0fde36f3ff2d27d1df19f7e8254 | |
parent | 50609054ecfb18bbdaf1aa56fe2c801be95f31db (diff) | |
download | meson-f9910d2c113e4d593dc1fe4099c52dc3fb828c9c.zip meson-f9910d2c113e4d593dc1fe4099c52dc3fb828c9c.tar.gz meson-f9910d2c113e4d593dc1fe4099c52dc3fb828c9c.tar.bz2 |
Ensure cargs and libs variables always exist. Closes #581.
-rw-r--r-- | mesonbuild/dependencies.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index 271c6b4..e2c932e 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -88,6 +88,8 @@ class PkgConfigDependency(Dependency): self.static = kwargs.get('static', False) if not isinstance(self.static, bool): raise DependencyException('Static keyword must be boolean') + self.cargs = [] + self.libs = [] if 'native' in kwargs and environment.is_cross_build(): want_cross = not kwargs['native'] else: @@ -100,8 +102,6 @@ class PkgConfigDependency(Dependency): if not PkgConfigDependency.pkgconfig_found: if self.required: raise DependencyException('Pkg-config not found.') - self.cargs = [] - self.libs = [] return if environment.is_cross_build() and want_cross: if "pkgconfig" not in environment.cross_info.config["binaries"]: @@ -122,8 +122,6 @@ class PkgConfigDependency(Dependency): if self.required: raise DependencyException('%s dependency %s not found.' % (self.type_string, name)) self.modversion = 'none' - self.cargs = [] - self.libs = [] else: self.modversion = out.decode().strip() mlog.log('%s dependency' % self.type_string, mlog.bold(name), 'found:', |