aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-07-16 17:32:07 -0400
committerJack Lloyd <[email protected]>2017-07-16 17:32:07 -0400
commit2a4b1a70ddc2b7db6ab4f5b86ebbd6f4eb2f4fd8 (patch)
tree096b7f25eaec657a8046d75950e2f887ed5526d7
parenteb924f4dfe7d527c2df6fe927fd84f6b5c0573bd (diff)
parent6e1ea3f3f3184137d143e025c10a8e90294b979e (diff)
Merge GH #1112 Cleanup in configure
-rwxr-xr-xconfigure.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.py b/configure.py
index 184e64b3d..e2e4f0e96 100755
--- a/configure.py
+++ b/configure.py
@@ -2592,12 +2592,13 @@ def detect_compiler_version(ccinfo, cc_bin, os_name):
cc_version = None
version = re.compile(version_re_str)
- cc_output = subprocess.Popen(cc_cmd,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- universal_newlines=True).communicate()
+ stdout, stderr = subprocess.Popen(
+ cc_cmd,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ universal_newlines=True).communicate()
+ cc_output = stdout + "\n" + stderr
- cc_output = str(cc_output)
match = version.search(cc_output)
if match: