diff options
Diffstat (limited to 'src/engine/SCons/Tool/gcc.py')
| -rw-r--r-- | src/engine/SCons/Tool/gcc.py | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/gcc.py b/src/engine/SCons/Tool/gcc.py index ad02e0d..4e81ba8 100644 --- a/src/engine/SCons/Tool/gcc.py +++ b/src/engine/SCons/Tool/gcc.py @@ -33,11 +33,12 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import SCons.Util - import cc import os import re +import subprocess + +import SCons.Util compilers = ['gcc', 'cc'] @@ -52,7 +53,20 @@ def generate(env): env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS -fPIC') # determine compiler version if env['CC']: - line = os.popen(env['CC'] + ' --version').readline() + try: + pipe = subprocess.Popen([env['CC'], '--version'], + env=env['ENV'], + stderr = subprocess.PIPE, + stdout = subprocess.PIPE) + except OSError: + return + # -dumpversion was added in GCC 3.0. As long as we're supporting + # GCC versions older than that, we should use --version and a + # regular expression. + #line = pipe.stdout.read().strip() + #if line: + # env['CCVERSION'] = line + line = pipe.stdout.readline() match = re.search(r'[0-9]+(\.[0-9]+)+', line) if match: env['CCVERSION'] = match.group(0) |