Browse Source

Merge pull request #23704 from ibrahn/fix-py3-x11detect

Fix gcc version check when running scons in python 3.
Rémi Verschelde 7 years ago
parent
commit
79c2608922
1 changed files with 2 additions and 0 deletions
  1. 2 0
      platform/x11/detect.py

+ 2 - 0
platform/x11/detect.py

@@ -1,6 +1,7 @@
 import os
 import os
 import platform
 import platform
 import sys
 import sys
+from compat import decode_utf8
 
 
 
 
 def is_active():
 def is_active():
@@ -154,6 +155,7 @@ def configure(env):
     import subprocess
     import subprocess
     proc = subprocess.Popen([env['CXX'], '--version'], stdout=subprocess.PIPE)
     proc = subprocess.Popen([env['CXX'], '--version'], stdout=subprocess.PIPE)
     (stdout, _) = proc.communicate()
     (stdout, _) = proc.communicate()
+    stdout = decode_utf8(stdout)
     match = re.search('[0-9][0-9.]*', stdout)
     match = re.search('[0-9][0-9.]*', stdout)
     if match is not None:
     if match is not None:
         version = match.group().split('.')
         version = match.group().split('.')