Adding in new software construction toolkit version.

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

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

1 files changed, 4 insertions, 10 deletions

diff --git a/site_scons/site_tools/concat_source.py b/site_scons/site_tools/concat_source.py
index c67463b..0598f97 100644
--- a/site_scons/site_tools/concat_source.py
+++ b/site_scons/site_tools/concat_source.py
@@ -52,14 +52,7 @@ def ConcatSourceBuilder(target, source, env):
   output_lines = [
       '// This file is auto-generated by the ConcatSource builder.']
 
-  for source_file in source:
-    # Skip source files which are not CPP files.  These will be passed through
-    # to the output list by the pseudo-builder.
-    if source_file.suffix not in env['CONCAT_SOURCE_SUFFIXES']:
-      continue
-
-    source_path = str(source_file)
-
+  for source_path in map(str, source):
     if env.get('CC') == 'cl':
       # Add message pragma for nicer progress indication when building with
       # MSVC.
@@ -93,8 +86,9 @@ def ConcatSourcePseudoBuilder(self, target, source):
     # from other files (which we pass through).
     cppsource = []
     outputs = []
-    for source_file in SCons.Script.Flatten(source):
-      if self.File(source_file).suffix in self['CONCAT_SOURCE_SUFFIXES']:
+    suffixes = self.Flatten(self.subst_list('$CONCAT_SOURCE_SUFFIXES'))
+    for source_file in self.arg2nodes(source):
+      if source_file.suffix in suffixes:
         cppsource.append(source_file)
       else:
         outputs.append(source_file)