summaryrefslogtreecommitdiff
path: root/configure.py
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2019-06-07 11:36:39 +0200
committerRich Trott <rtrott@gmail.com>2019-06-14 15:40:46 -0700
commit16edec8cfab1d88e86de75057b669ccaea5ced87 (patch)
tree02a3067d0c8b8343ab53d4af3b0d6c7119f70f0f /configure.py
parentb6148402d461ffb70446ddd4b55051e093ad1aef (diff)
downloadandroid-node-v8-16edec8cfab1d88e86de75057b669ccaea5ced87.tar.gz
android-node-v8-16edec8cfab1d88e86de75057b669ccaea5ced87.tar.bz2
android-node-v8-16edec8cfab1d88e86de75057b669ccaea5ced87.zip
build: don't swallow pkg-config warnings
PR-URL: https://github.com/nodejs/node/pull/28118 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Refael Ackermann (רפאל פלחי) <refack@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.py b/configure.py
index 16ee259dc2..71943cae2c 100755
--- a/configure.py
+++ b/configure.py
@@ -628,18 +628,20 @@ def pkg_config(pkg):
Returns ("-l flags", "-I flags", "-L flags", "version")
otherwise (None, None, None, None)"""
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
+ args = [] # Print pkg-config warnings on first round.
retval = ()
for flag in ['--libs-only-l', '--cflags-only-I',
'--libs-only-L', '--modversion']:
+ args += [flag, pkg]
try:
- proc = subprocess.Popen(
- shlex.split(pkg_config) + ['--silence-errors', flag, pkg],
- stdout=subprocess.PIPE)
+ proc = subprocess.Popen(shlex.split(pkg_config) + args,
+ stdout=subprocess.PIPE)
val = proc.communicate()[0].strip()
except OSError as e:
if e.errno != errno.ENOENT: raise e # Unexpected error.
return (None, None, None, None) # No pkg-config/pkgconf installed.
retval += (val,)
+ args = ['--silence-errors']
return retval