Revert r4644, "Updated NaCl's build system to use SCons 2.0.1."

src/native_client/site_scons/site_tools/target_platform_windows.py

 #!/usr/bin/python2.4
 # Copyright 2009, Google Inc.
 # 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.
@@ skipping 243 matching lines @@
     WaitForWritable([env.File(dest)], None, env)
     env.Execute('$COVERAGE_VSINSTR /COVERAGE "%s"' % dest)
   else:
     env['PRECOVERAGE_INSTALL'](dest, source, env)
 
 
 def generate(env):
   # NOTE: SCons requires the use of this name, which fails gpylint.
   """SCons entry point for this tool."""
 
-  # TODO(ncbray): Several sections here are gated out on to prevent failure on
-  # non-windows platforms.  This appears to be SCons issue 1720 manifesting
-  # itself.  A more principled fix would be nice.
-
-  use_msvc_tools = env['PLATFORM'] in ('win32', 'cygwin')
+  # TODO: Several sections here are gated out on the mac to prevent failure.
+  # This appears to be SCons issue 1720 manifesting itself on Mac when using
+  # windows tools like msvs or msvc.
 
   # Preserve some variables that get blown away by the tools.
   saved = dict()
   for k in ['CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'LINKFLAGS', 'LIBS']:
     saved[k] = env.get(k, [])
     env[k] = []
 
   # Bring in the outside PATH, INCLUDE, and LIB if not blocked.
   if not env.get('MSVC_BLOCK_ENVIRONMENT_CHANGES'):
     env.AppendENVPath('PATH', os.environ.get('PATH', '[]'))
     env.AppendENVPath('INCLUDE', os.environ.get('INCLUDE', '[]'))
     env.AppendENVPath('LIB', os.environ.get('LIB', '[]'))
 
   # Load various Visual Studio related tools.
-  if use_msvc_tools:
+  if env['PLATFORM'] != 'darwin':
     env.Tool('as')
     env.Tool('msvs')
     env.Tool('windows_hard_link')
 
   pre_msvc_env = env['ENV'].copy()
 
-  if use_msvc_tools:
+  if env['PLATFORM'] != 'darwin':
     env.Tool('msvc')
     env.Tool('mslib')
     env.Tool('mslink')
 
   # Find VC80_DIR if it isn't already set.
   if not env.get('VC80_DIR'):
     # Look in each directory in the path for cl.exe.
     for p in env['ENV']['PATH'].split(os.pathsep):
       # Use the directory two layers up if it exists.
       if os.path.exists(os.path.join(p, 'cl.exe')):
@@ skipping 108 matching lines @@
       LINKFLAGS_OPTIMIZED=['/PDBALTPATH:%_PDB%'],
 
       # Settings for component_builders
       COMPONENT_LIBRARY_LINK_SUFFIXES=['.lib'],
       COMPONENT_LIBRARY_DEBUG_SUFFIXES=['.pdb'],
   )
 
   # TODO: mslink.py creates a shlibLinkAction which doesn't specify
   # '$SHLINKCOMSTR' as its command string.  This breaks --brief.  For now,
   # hack into the existing action and override its command string.
-  if use_msvc_tools:
+  if env['PLATFORM'] != 'darwin':
     env['SHLINKCOM'].list[0].cmdstr = '$SHLINKCOMSTR'
 
   # Restore saved flags.
   env.Append(**saved)