diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:33:13 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:33:13 +0200 |
commit | f762ee6d16ccdd40317608b11e685e2f17c06f22 (patch) | |
tree | 8424afe37359fbcde2e014eda338869947e11c2e /src/engine/SCons/Tool/swig.py | |
parent | 02292cfec56d773f3e3e8607f5b7f76f97c9c874 (diff) | |
parent | 16bc58049adac72cb1f398d9f89e42757bb4a22f (diff) |
Merge tag 'upstream/2.3.3'
Upstream version 2.3.3
Diffstat (limited to 'src/engine/SCons/Tool/swig.py')
-rw-r--r-- | src/engine/SCons/Tool/swig.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index 2413eb0..4312366 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/swig.py 2014/07/05 09:42:21 garyo" +__revision__ = "src/engine/SCons/Tool/swig.py 2014/08/24 12:12:31 garyo" import os.path import re @@ -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 |