summaryrefslogtreecommitdiff
path: root/third_party/waf
diff options
context:
space:
mode:
authorUri Simchoni <uri@samba.org>2017-01-19 07:46:57 +0200
committerJeremy Allison <jra@samba.org>2017-01-25 04:23:00 +0100
commit2cf141ed45b4f7b7754cb9525d987ff38495d789 (patch)
tree183d6b540dbab5675ef1ed785870002a4b0af10d /third_party/waf
parent17a6e57fcc37c56d4d9b52fad475531f32abac10 (diff)
downloadsamba-2cf141ed45b4f7b7754cb9525d987ff38495d789.tar.gz
waf: backport finding of pkg-config
Allow the builder to customize the location of pkg-config utility by setting PKGCONFIG environment variable. This is backported from upstream waf. Thanks to Zentaro Kavanagh <zentaro@google.com> for pointing that out and proposing the fix. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12529 Signed-off-by: Uri Simchoni <uri@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Wed Jan 25 04:23:00 CET 2017 on sn-devel-144
Diffstat (limited to 'third_party/waf')
-rw-r--r--third_party/waf/wafadmin/Tools/config_c.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/waf/wafadmin/Tools/config_c.py b/third_party/waf/wafadmin/Tools/config_c.py
index 3ab447ccf42..cdf3b3ebb68 100644
--- a/third_party/waf/wafadmin/Tools/config_c.py
+++ b/third_party/waf/wafadmin/Tools/config_c.py
@@ -106,7 +106,9 @@ def ret_msg(self, f, kw):
@conf
def validate_cfg(self, kw):
if not 'path' in kw:
- kw['path'] = 'pkg-config --errors-to-stdout --print-errors'
+ if not self.env.PKGCONFIG:
+ self.find_program('pkg-config', var='PKGCONFIG')
+ kw['path'] = self.env.PKGCONFIG
# pkg-config version
if 'atleast_pkgconfig_version' in kw: