diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-14 13:37:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 13:37:37 +0100 |
| commit | 79c2608922cd4c7d34e1e1ea4023800f63c8ceb0 (patch) | |
| tree | 01f8e3cd139532d937ac9717e7778f8c2be59f44 | |
| parent | 984063cf0b926b7eb354b9618acd042bdeeda2a4 (diff) | |
| parent | 4c90a66e74909595c1f1e8053c2cd74c2a2be035 (diff) | |
Merge pull request #23704 from ibrahn/fix-py3-x11detect
Fix gcc version check when running scons in python 3.
| -rw-r--r-- | platform/x11/detect.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index e257a20bdd..524c8448bc 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -1,6 +1,7 @@ import os import platform import sys +from compat import decode_utf8 def is_active(): @@ -154,6 +155,7 @@ def configure(env): import subprocess proc = subprocess.Popen([env['CXX'], '--version'], stdout=subprocess.PIPE) (stdout, _) = proc.communicate() + stdout = decode_utf8(stdout) match = re.search('[0-9][0-9.]*', stdout) if match is not None: version = match.group().split('.') |