summaryrefslogtreecommitdiff
path: root/engine/SCons/Tool/gcc.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-09-28 10:21:25 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-09-28 10:21:25 +0200
commit4f3ca5f60f4de1aca6e3b9d7f30467ba0f724c27 (patch)
treed47e14dc637e15861e9ba7d65e5f4aae5d79df6d /engine/SCons/Tool/gcc.py
parent3765e33b76c51c81dd7bbbfacab0c4e76a1713cb (diff)
parent7c651e273c4db37f4babd91aaecf26800c50dd79 (diff)
Updated version 3.0.0 from 'upstream/3.0.0'
with Debian dir f5f84710e04b09c178d76c96bcda7517932c0c17
Diffstat (limited to 'engine/SCons/Tool/gcc.py')
-rw-r--r--engine/SCons/Tool/gcc.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/SCons/Tool/gcc.py b/engine/SCons/Tool/gcc.py
index 427e80c..f241c7b 100644
--- a/engine/SCons/Tool/gcc.py
+++ b/engine/SCons/Tool/gcc.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001 - 2016 The SCons Foundation
+# Copyright (c) 2001 - 2017 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -31,9 +31,9 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gcc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
+__revision__ = "src/engine/SCons/Tool/gcc.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
-import cc
+from . import cc
import os
import re
import subprocess
@@ -80,13 +80,13 @@ def detect_version(env, cc):
#line = pipe.stdout.read().strip()
#if line:
# version = line
- line = pipe.stdout.readline()
+ line = SCons.Util.to_str(pipe.stdout.readline())
match = re.search(r'[0-9]+(\.[0-9]+)+', line)
if match:
version = match.group(0)
# Non-GNU compiler's output (like AIX xlc's) may exceed the stdout buffer:
# So continue with reading to let the child process actually terminate.
- while pipe.stdout.readline():
+ while SCons.Util.to_str(pipe.stdout.readline()):
pass
ret = pipe.wait()
if ret != 0: