diff options
| author | Greg Noel <GregNoel@tigris.org> | 2008-09-22 08:11:34 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2008-09-22 08:11:34 (GMT) |
| commit | df89ddcab4d35ffc573b1ac9e4cb131761149667 (patch) | |
| tree | 68ea5dbc46d44172204e37387057e349beb5c4d2 /src/engine/SCons/Tool | |
| parent | efc3f9f021199529d94058930a0660008824f5c3 (diff) | |
| download | SCons-df89ddcab4d35ffc573b1ac9e4cb131761149667.zip SCons-df89ddcab4d35ffc573b1ac9e4cb131761149667.tar.gz SCons-df89ddcab4d35ffc573b1ac9e4cb131761149667.tar.bz2 | |
make references to subprocess.Popen synchronous
Diffstat (limited to 'src/engine/SCons/Tool')
| -rw-r--r-- | src/engine/SCons/Tool/g++.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/gcc.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/engine/SCons/Tool/g++.py b/src/engine/SCons/Tool/g++.py index f8f5b34..61d095e 100644 --- a/src/engine/SCons/Tool/g++.py +++ b/src/engine/SCons/Tool/g++.py @@ -63,9 +63,11 @@ def generate(env): env['SHOBJSUFFIX'] = '.pic.o' # determine compiler version if env['CXX']: + #pipe = SCons.Action._subproc(env, [env['CXX'], '-dumpversion'], pipe = SCons.Action._subproc(env, [env['CXX'], '--version'], stderr = subprocess.PIPE, stdout = subprocess.PIPE) + if pipe.wait() != 0: 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. diff --git a/src/engine/SCons/Tool/gcc.py b/src/engine/SCons/Tool/gcc.py index 232d64a..7d2b1b8 100644 --- a/src/engine/SCons/Tool/gcc.py +++ b/src/engine/SCons/Tool/gcc.py @@ -53,9 +53,11 @@ def generate(env): env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS -fPIC') # determine compiler version if env['CC']: + #pipe = SCons.Action._subproc(env, [env['CC'], '-dumpversion'], pipe = SCons.Action._subproc(env, [env['CC'], '--version'], stderr = subprocess.PIPE, stdout = subprocess.PIPE) + if pipe.wait() != 0: 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. |