diff options
| author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2016-11-22 16:35:36 +0100 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2016-12-05 10:57:10 +0100 |
| commit | 6d1b6de6b01f9fa06ef2c374aacb69b38cf2bd1b (patch) | |
| tree | fc0977f47e38d2f321ae137a2ffbfcf2942e0a60 | |
| parent | e9b2084592aaab84dc08a917e85aee9827027f08 (diff) | |
| download | meson-6d1b6de6b01f9fa06ef2c374aacb69b38cf2bd1b.zip meson-6d1b6de6b01f9fa06ef2c374aacb69b38cf2bd1b.tar.gz meson-6d1b6de6b01f9fa06ef2c374aacb69b38cf2bd1b.tar.bz2 | |
dependencies: allow overriding pkg-config with PKG_CONFIG when setting pkgbin
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
| -rw-r--r-- | mesonbuild/dependencies.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index 5f0c261..b76c3cb 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -123,7 +123,11 @@ class PkgConfigDependency(Dependency): pkgbin = environment.cross_info.config["binaries"]['pkgconfig'] self.type_string = 'Cross' else: - pkgbin = 'pkg-config' + evar = 'PKG_CONFIG' + if evar in os.environ: + pkgbin = os.environ[evar].strip() + else: + pkgbin = 'pkg-config' self.type_string = 'Native' mlog.debug('Determining dependency %s with pkg-config executable %s.' % (name, pkgbin)) |