Moving to scons 1.1.0

Review URL: http://codereview.chromium.org/8900

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4197 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 3 deletions

diff --git a/third_party/scons/scons-local/SCons/Subst.py b/third_party/scons/scons-local/SCons/Subst.py
index d6dac31..df3942f 100644
--- a/third_party/scons/scons-local/SCons/Subst.py
+++ b/third_party/scons/scons-local/SCons/Subst.py
@@ -27,7 +27,7 @@ SCons string substitution.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Subst.py 3424 2008/09/15 11:22:20 scons"
+__revision__ = "src/engine/SCons/Subst.py 3603 2008/10/10 05:46:45 scons"
 
 import re
 import string
@@ -270,7 +270,13 @@ def subst_dict(target, source):
     dict = {}
 
     if target:
-        tnl = NLWrapper(target, lambda x: x.get_subst_proxy())
+        def get_tgt_subst_proxy(thing):
+            try:
+                subst_proxy = thing.get_subst_proxy()
+            except AttributeError:
+                subst_proxy = thing # probably a string, just return it
+            return subst_proxy
+        tnl = NLWrapper(target, get_tgt_subst_proxy)
         dict['TARGETS'] = Targets_or_Sources(tnl)
         dict['TARGET'] = Target_or_Source(tnl)
     else:
@@ -285,7 +291,10 @@ def subst_dict(target, source):
                 pass
             else:
                 node = rfile()
-            return node.get_subst_proxy()
+            try:
+                return node.get_subst_proxy()
+            except AttributeError:
+                return node     # probably a String, just return it
         snl = NLWrapper(source, get_src_subst_proxy)
         dict['SOURCES'] = Targets_or_Sources(snl)
         dict['SOURCE'] = Target_or_Source(snl)