Work around issue 80 by splitting strings from the environment...

SConstruct

 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 12 matching lines @@
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import platform
 import re
 import sys
 import os
 from os.path import join, dirname, abspath
-from types import DictType
+from types import DictType, StringTypes
 root_dir = dirname(File('SConstruct').rfile().abspath)
 sys.path.append(join(root_dir, 'tools'))
 import js2c, utils
 
 
 LIBRARY_FLAGS = {
   'all': {
     'CPPDEFINES':   ['ENABLE_LOGGING_AND_PROFILING']
   },
   'gcc': {
@@ skipping 87 matching lines @@
       'CPPDEFINES':   ['BUILDING_V8_SHARED']
     }
   }
 }
 
 
 DTOA_EXTRA_FLAGS = {
   'gcc': {
     'all': {
       'WARNINGFLAGS': ['-Werror']
-    }  
+    }
   },
   'msvc': {
     'all': {
       'WARNINGFLAGS': ['/WX', '/wd4018', '/wd4244']
     }
   }
 }
 
 
 CCTEST_EXTRA_FLAGS = {
@@ skipping 154 matching lines @@
     'help': 'set how the build system detects file changes'
   }
 }
 
 
 def GetOptions():
   result = Options()
   result.Add('mode', 'compilation mode (debug, release)', 'release')
   result.Add('sample', 'build sample (shell, process)', '')
   result.Add('env', 'override environment settings (NAME1:value1,NAME2:value2)', '')
-  for (name, option) in SIMPLE_OPTIONS.items():
+  for (name, option) in SIMPLE_OPTIONS.iteritems():
     help = '%s (%s)' % (name, ", ".join(option['values']))
     result.Add(name, help, option.get('default'))
   return result
 
 
 def SplitList(str):
   return [ s for s in str.split(",") if len(s) > 0 ]
 
 
 def IsLegal(env, option, values):
   str = env[option]
   for s in SplitList(str):
     if not s in values:
       Abort("Illegal value for option %s '%s'." % (option, s))
       return False
   return True
 
 
 def VerifyOptions(env):
   if not IsLegal(env, 'mode', ['debug', 'release']):
     return False
   if not IsLegal(env, 'sample', ["shell", "process"]):
     return False
-  for (name, option) in SIMPLE_OPTIONS.items():
+  for (name, option) in SIMPLE_OPTIONS.iteritems():
     if (not option.get('default')) and (name not in ARGUMENTS):
       message = ("A value for option %s must be specified (%s)." %
           (name, ", ".join(option['values'])))
       Abort(message)
     if not env[name] in option['values']:
       message = ("Unknown %s value '%s'.  Possible values are (%s)." %
           (name, env[name], ", ".join(option['values'])))
       Abort(message)
 
 
 class BuildContext(object):
 
   def __init__(self, options, env_overrides, samples):
     self.library_targets = []
     self.cctest_targets = []
     self.sample_targets = []
     self.options = options
     self.env_overrides = env_overrides
     self.samples = samples
     self.use_snapshot = (options['snapshot'] == 'on')
     self.flags = None
-  
+
   def AddRelevantFlags(self, initial, flags):
     result = initial.copy()
     self.AppendFlags(result, flags.get('all'))
     toolchain = self.options['toolchain']
     self.AppendFlags(result, flags[toolchain].get('all'))
     for option in sorted(self.options.keys()):
       value = self.options[option]
       self.AppendFlags(result, flags[toolchain].get(option + ':' + value))
     return result
-  
+
   def GetRelevantSources(self, source):
     result = []
     result += source.get('all', [])
-    for (name, value) in self.options.items():
+    for (name, value) in self.options.iteritems():
       result += source.get(name + ':' + value, [])
     return sorted(result)
 
   def AppendFlags(self, options, added):
     if not added:
       return
-    for (key, value) in added.items():
+    for (key, value) in added.iteritems():
       if not key in options:
         options[key] = value
       else:
-        options[key] = options[key] + value
+        prefix = options[key]
+        if isinstance(prefix, StringTypes): prefix = prefix.split()
+        options[key] = prefix + value
 
   def ConfigureObject(self, env, input, **kw):
     if self.options['library'] == 'static':
       return env.StaticObject(input, **kw)
     else:
       return env.SharedObject(input, **kw)
 
   def ApplyEnvOverrides(self, env):
     if not self.env_overrides:
       return
@@ skipping 28 matching lines @@
   for option in SIMPLE_OPTIONS:
     options[option] = env[option]
   PostprocessOptions(options)
 
   context = BuildContext(options, env_overrides, samples=SplitList(env['sample']))
 
   library_flags = context.AddRelevantFlags(os.environ, LIBRARY_FLAGS)
   v8_flags = context.AddRelevantFlags(library_flags, V8_EXTRA_FLAGS)
   jscre_flags = context.AddRelevantFlags(library_flags, JSCRE_EXTRA_FLAGS)
   dtoa_flags = context.AddRelevantFlags(library_flags, DTOA_EXTRA_FLAGS)
-  cctest_flags = context.AddRelevantFlags(v8_flags, CCTEST_EXTRA_FLAGS)  
+  cctest_flags = context.AddRelevantFlags(v8_flags, CCTEST_EXTRA_FLAGS)
   sample_flags = context.AddRelevantFlags(os.environ, SAMPLE_FLAGS)
 
   context.flags = {
     'v8': v8_flags,
     'jscre': jscre_flags,
     'dtoa': dtoa_flags,
     'cctest': cctest_flags,
     'sample': sample_flags
   }
-  
+
   target_id = mode
   suffix = SUFFIXES[target_id]
   library_name = 'v8' + suffix
   env['LIBRARY'] = library_name
 
   # Build the object files by invoking SCons recursively.  
   object_files = env.SConscript(
     join('src', 'SConscript'),
     build_dir=join('obj', target_id),
     exports='context',
@@ skipping 73 matching lines @@
 # version of scons.  Also, there's a bug in some revisions that
 # doesn't allow this flag to be set, so we swallow any exceptions.
 # Lovely.
 try:
   SetOption('warn', 'no-deprecated')
 except:
   pass
 
 
 Build()