Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-04-11 18:14:19 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-04-11 18:14:56 (GMT) |
| commit | d9a29f93cd4ff505e264974febd0566ae29880ca (patch) | |
| tree | 6eea9e476374863e93c80aacb76840ac24f0c50f /3rdParty/SCons/scons-local/SCons/Tool/linkloc.py | |
| parent | 73f845a3f380c5a1adbac2cf29e9f36cc9b498cf (diff) | |
| download | swift-d9a29f93cd4ff505e264974febd0566ae29880ca.zip swift-d9a29f93cd4ff505e264974febd0566ae29880ca.tar.bz2 | |
Update SCons to 1.3.0.d20100404.
Diffstat (limited to '3rdParty/SCons/scons-local/SCons/Tool/linkloc.py')
| -rw-r--r-- | 3rdParty/SCons/scons-local/SCons/Tool/linkloc.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/3rdParty/SCons/scons-local/SCons/Tool/linkloc.py b/3rdParty/SCons/scons-local/SCons/Tool/linkloc.py index 7fd3a3b..d0718d1 100644 --- a/3rdParty/SCons/scons-local/SCons/Tool/linkloc.py +++ b/3rdParty/SCons/scons-local/SCons/Tool/linkloc.py @@ -10,7 +10,7 @@ selection method. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -32,7 +32,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/linkloc.py 4043 2009/02/23 09:06:45 scons" +__revision__ = "src/engine/SCons/Tool/linkloc.py 4761 2010/04/04 14:04:44 bdeegan" import os.path import re @@ -43,7 +43,7 @@ import SCons.Errors import SCons.Tool import SCons.Util -from SCons.Tool.MSCommon import detect_msvs, merge_default_version +from SCons.Tool.MSCommon import msvs_exists, merge_default_version from SCons.Tool.PharLapCommon import addPharLapPaths _re_linker_command = re.compile(r'(\s)@\s*([^\s]+)') @@ -100,7 +100,7 @@ def generate(env): addPharLapPaths(env) def exists(env): - if detect_msvs(): + if msvs_exists(): return env.Detect('linkloc') else: return 0 |