diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-21 01:52:38 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-21 01:52:38 (GMT) |
| commit | 678c769bc6189b5b7c301fbecfb37496725f6aee (patch) | |
| tree | 0b0b37051a29dd48d2fb9c9c49a11182a276a0d9 /src/engine/SCons/Tool/swig.py | |
| parent | a035c43fb34cc888fca250f26f68fc2b03c018ac (diff) | |
| download | SCons-678c769bc6189b5b7c301fbecfb37496725f6aee.zip SCons-678c769bc6189b5b7c301fbecfb37496725f6aee.tar.gz SCons-678c769bc6189b5b7c301fbecfb37496725f6aee.tar.bz2 | |
SWIG: improve tool detection, and update SWIG tests to run on Windows.
The tool detection is improved by checking for swig in
env['SWIG'], where it is commonly set, as well as env['ENV']['PATH'].
The tests mostly didn't work on Windows. I updated them all.
Mostly to build 32-bit extensions when using 32-bit python on
Windows, and use .pyd as the python extension on Windows.
Diffstat (limited to 'src/engine/SCons/Tool/swig.py')
| -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 |