diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-22 01:19:07 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-22 01:19:07 (GMT) |
| commit | 6db60dbe1c3dc28f24bfca48135bcb4bc9bd66d6 (patch) | |
| tree | 47726be5f922a48bcade0157c9269d8198c48259 /src/engine | |
| parent | 1e802a0856670237facf60687409b37b32cfa4b4 (diff) | |
| parent | 4d4029a77e986d64153b3de0ece5177dbaed5cd9 (diff) | |
| download | SCons-6db60dbe1c3dc28f24bfca48135bcb4bc9bd66d6.zip SCons-6db60dbe1c3dc28f24bfca48135bcb4bc9bd66d6.tar.gz SCons-6db60dbe1c3dc28f24bfca48135bcb4bc9bd66d6.tar.bz2 | |
Merged in garyo/scons-garyo (pull request #173)
SWIG: improve tool detection, and update SWIG tests to run on Windows.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Tool/swig.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index d51a386..f166174 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -174,7 +174,8 @@ def generate(env): env.Append(SCANNERS = scanner) def exists(env): - return env.Detect(['swig']) + swig = env.get('SWIG') or env.Detect(['swig']) + return swig # Local Variables: # tab-width:4 |