diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:11:39 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:11:39 +0200 |
| commit | b2fa39f7baf24a9da2ee40e6d625e8ce91c4b471 (patch) | |
| tree | f9eca9049e11ca23426f8cf8b5302f65b547d49d /engine/SCons/Tool/swig.py | |
| parent | df9075291049202264a88a9740f281a55823ff62 (diff) | |
| parent | 765fbac29295fb4e462c480d09dbdb2f9718a845 (diff) | |
Merge tag 'upstream/2.3.3'
Upstream version 2.3.3
Diffstat (limited to 'engine/SCons/Tool/swig.py')
| -rw-r--r-- | engine/SCons/Tool/swig.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/SCons/Tool/swig.py b/engine/SCons/Tool/swig.py index 2413eb0..4312366 100644 --- a/engine/SCons/Tool/swig.py +++ b/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 |