diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-06-16 18:10:14 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-06-16 18:10:14 +0300 |
commit | 41e89c5cb57805d1e9b7fa84169d3411efa8c692 (patch) | |
tree | 58cbcc8192482cdf85d9cd90b9a542cc73f64ebb | |
parent | 17e8bcdf04e3a454527731f2df594c52996b0bf7 (diff) | |
download | meson-41e89c5cb57805d1e9b7fa84169d3411efa8c692.zip meson-41e89c5cb57805d1e9b7fa84169d3411efa8c692.tar.gz meson-41e89c5cb57805d1e9b7fa84169d3411efa8c692.tar.bz2 |
Verify output of gnustep dependency program.
-rw-r--r-- | dependencies.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/dependencies.py b/dependencies.py index 4f7c1d4..9ed8dee 100644 --- a/dependencies.py +++ b/dependencies.py @@ -414,12 +414,20 @@ class GnuStepDependency(Dependency): arg = '--base-libs' fp = subprocess.Popen([confprog, '--objc-flags'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - flagtxt = fp.communicate()[0].decode() + (flagtxt, flagerr) = fp.communicate() + flagtxt = flagtxt.decode() + flagerr = flagerr.decode() + if fp.returncode != 0: + raise DependencyException('Error getting objc-flags: %s %s' % (flagtxt, flagerr)) flags = flagtxt.split() self.flags = self.filter_flags(flags) fp = subprocess.Popen([confprog, arg], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - libtxt = fp.communicate()[0].decode() + (libtxt, liberr) = fp.communicate() + libtxt = libtxt.decode() + liberr = liberr.decode() + if fp.returncode != 0: + raise DependencyException('Error getting objc-lib flags: %s %s' % (libtxt, liberr)) self.libs = libtxt.split() print('Dependency GnuStep found: YES') |