diff options
Diffstat (limited to 'site_scons/mongo/toolchain.py')
| -rw-r--r-- | site_scons/mongo/toolchain.py | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/site_scons/mongo/toolchain.py b/site_scons/mongo/toolchain.py index ffa74f56f6f..9bab92a68b7 100644 --- a/site_scons/mongo/toolchain.py +++ b/site_scons/mongo/toolchain.py @@ -6,31 +6,22 @@ import SCons # Helper functions for generic toolchain things go here + def get_toolchain_ver(env, tool): # By default we don't know the version of each tool, and only report what # command gets executed (gcc vs /opt/mongodbtoolchain/bin/gcc). verstr = "version unknown" proc = None if env.ToolchainIs('clang', 'gcc'): - proc = SCons.Action._subproc(env, - env.subst("${%s} --version" % tool), - stdout=subprocess.PIPE, - stderr='devnull', - stdin='devnull', - universal_newlines=True, - error='raise', - shell=True) + proc = SCons.Action._subproc(env, env.subst("${%s} --version" % tool), + stdout=subprocess.PIPE, stderr='devnull', stdin='devnull', + universal_newlines=True, error='raise', shell=True) verstr = proc.stdout.readline() elif env.ToolchainIs('msvc') and env.TargetOSIs('windows'): - proc = SCons.Action._subproc(env, - env.subst("${%s}" % tool), - stdout='devnull', - stderr=subprocess.PIPE, - stdin='devnull', - universal_newlines=True, - error='raise', - shell=True) + proc = SCons.Action._subproc(env, env.subst("${%s}" % tool), stdout='devnull', + stderr=subprocess.PIPE, stdin='devnull', + universal_newlines=True, error='raise', shell=True) verstr = proc.stderr.readline() # If we started a process, we should drain its stdout/stderr and wait for |