diff options
| author | Pawel Tomulik <ptomulik@meil.pw.edu.pl> | 2015-10-19 18:13:55 (GMT) |
|---|---|---|
| committer | Pawel Tomulik <ptomulik@meil.pw.edu.pl> | 2015-10-19 18:13:55 (GMT) |
| commit | f1f51552641c5137d5196b962446dfe2f7236995 (patch) | |
| tree | a065b4a017f872b559ad48a2d6e5d10e43a277ac | |
| parent | 3cde69b6fb17c84aaf4fca368feb63cefd44ce97 (diff) | |
| download | SCons-f1f51552641c5137d5196b962446dfe2f7236995.zip SCons-f1f51552641c5137d5196b962446dfe2f7236995.tar.gz SCons-f1f51552641c5137d5196b962446dfe2f7236995.tar.bz2 | |
fix swig tool to properly retrieve swig version
| -rw-r--r-- | src/engine/SCons/Tool/swig.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index 8828ef1..44686ef 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -130,9 +130,10 @@ def _swigEmitter(target, source, env): target.extend(java_files) return (target, source) -def _get_swig_version(env): +def _get_swig_version(env, swig): """Run the SWIG command line tool to get and return the version number""" - pipe = SCons.Action._subproc(env, [env['SWIG'], '-version'], + swig = env.subst(swig) + pipe = SCons.Action._subproc(env, SCons.Util.CLVar(swig) + ['-version'], stdin = 'devnull', stderr = 'devnull', stdout = subprocess.PIPE) @@ -164,7 +165,7 @@ def generate(env): if 'SWIG' not in env: env['SWIG'] = env.Detect(swigs) or swigs[0] - env['SWIGVERSION'] = _get_swig_version(env) + env['SWIGVERSION'] = _get_swig_version(env, env['SWIG']) env['SWIGFLAGS'] = SCons.Util.CLVar('') env['SWIGDIRECTORSUFFIX'] = '_wrap.h' env['SWIGCFILESUFFIX'] = '_wrap$CFILESUFFIX' |