diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-09-22 17:10:51 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-09-22 17:10:51 (GMT) |
| commit | b554eb817c60f4e419bbc84efc02c7fbc62b7ced (patch) | |
| tree | 5d6a8f035bcce302da428d3dd9d26920407a78ee /src/engine/SCons/Tool/g++.py | |
| parent | 953dc41b8b720fdcec7955de67d23206214e5125 (diff) | |
| download | SCons-b554eb817c60f4e419bbc84efc02c7fbc62b7ced.zip SCons-b554eb817c60f4e419bbc84efc02c7fbc62b7ced.tar.gz SCons-b554eb817c60f4e419bbc84efc02c7fbc62b7ced.tar.bz2 | |
Manual python3 post-2to3 fixes from Neal Becker
Diffstat (limited to 'src/engine/SCons/Tool/g++.py')
| -rw-r--r-- | src/engine/SCons/Tool/g++.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/g++.py b/src/engine/SCons/Tool/g++.py index e4da5fe..0e1c181 100644 --- a/src/engine/SCons/Tool/g++.py +++ b/src/engine/SCons/Tool/g++.py @@ -40,8 +40,7 @@ import subprocess import SCons.Tool import SCons.Util -cplusplus = __import__('c++', globals(), locals(), []) - +cplusplus = __import__(__package__+'.c++', globals(), locals(), ['*']) compilers = ['g++'] def generate(env): @@ -75,7 +74,7 @@ def generate(env): #line = pipe.stdout.read().strip() #if line: # env['CXXVERSION'] = line - line = pipe.stdout.readline() + line = SCons.Util.to_str (pipe.stdout.readline()) match = re.search(r'[0-9]+(\.[0-9]+)+', line) if match: env['CXXVERSION'] = match.group(0) |