More fixes for PNaCl Windows.

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Nacl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 197 matching lines @@
   env.AppendUnique(SHCCFLAGS=['-fPIC'],
                    )
 
 def _SetEnvForPnacl(env, root):
   arch = env['TARGET_FULLARCH']
   assert arch in ['arm', 'x86-32', 'x86-64']
 
   arch_flag = ' -arch %s' % arch
 
   binprefix = os.path.join(root, 'bin', 'pnacl-')
+  binext = ''
+  if env.Bit('host_windows'):
+    binext = '.bat'
 
   pnacl_lib = os.path.join(root, 'lib')
   pnacl_lib_arch = os.path.join(root, 'lib-%s' % arch)
 
   #TODO(robertm): remove NACL_SDK_INCLUDE ASAP
   pnacl_include = os.path.join(root, 'sysroot', 'include')
-  pnacl_ar = binprefix + 'ar'
-  pnacl_nm = binprefix + 'nm'
-  pnacl_ranlib = binprefix + 'ranlib'
+  pnacl_ar = binprefix + 'ar' + binext
+  pnacl_nm = binprefix + 'nm' + binext
+  pnacl_ranlib = binprefix + 'ranlib' + binext
 
-  pnacl_cc = binprefix + 'gcc'
-  pnacl_cxx = binprefix + 'g++'
-  pnacl_ld = binprefix + 'ld'
-  pnacl_disass = binprefix + 'dis'
-  pnacl_strip = binprefix + 'strip'
+  pnacl_cc = binprefix + 'gcc' + binext
+  pnacl_cxx = binprefix + 'g++' + binext
+  pnacl_ld = binprefix + 'ld' + binext
+  pnacl_disass = binprefix + 'dis' + binext
+  pnacl_strip = binprefix + 'strip' + binext
 
   # NOTE: XXX_flags start with space for easy concatenation
   # The flags generated here get baked into the commands (CC, CXX, LINK)
   # instead of CFLAGS etc to keep them from getting blown away by some
   # tests. Don't add flags here unless they always need to be preserved.
   pnacl_cxx_flags = ''
   pnacl_cc_flags = ' -std=gnu99'
   pnacl_cc_native_flags = ' -std=gnu99' + arch_flag
   pnacl_ld_flags = ' ' + ' '.join(env['PNACL_BCLDFLAGS'])
 
@@ skipping 244 matching lines @@
   # Dependency files it produces are to be found in ${LIBPATH}.
   # It is applied recursively to those dependencies in case
   # some of them are linker scripts too.
   ldscript_scanner = SCons.Scanner.Base(
       function=ScanLinkerScript,
       skeys=['.a', '.so'],
       path_function=SCons.Scanner.FindPathDirs('LIBPATH'),
       recursive=True
       )
   env.Append(SCANNERS=ldscript_scanner)