Fix untrusted.gypi and build_nexe.py

build/build_nexe.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 """NEXE building script
 
 This module will take a set of source files, include paths, library paths, and
 additional arguments, and use them to build.
 """
 
+import hashlib
 from optparse import OptionParser
 import os
 import re
 import Queue
 import shutil
 import subprocess
 import sys
 import tempfile
 import threading
 import urllib2
@@ skipping 37 matching lines @@
 def RemoveFile(path):
   os.remove(FixPath(path))
 
 
 def OpenFile(path, mode='r'):
   return open(FixPath(path), mode)
 
 
 def RemoveQuotes(opt):
   if opt and opt[0] == '"':
-    return opt[1:-1]
+    assert opt[-1] == '"', opt
+    return opt[1:-1].replace('\\"', '"')
   return opt
 
 
 def ArgToList(opt):
   outlist = []
   if opt is None:
     return outlist
-  optlist = RemoveQuotes(opt).split(' ')
+  optlist = opt.split(' ')
   for optitem in optlist:
-    optitem = RemoveQuotes(optitem).replace('\\"', '"')
+    optitem = RemoveQuotes(optitem)
     if optitem:
       outlist.append(optitem)
   return outlist
 
 
 def GetMTime(filepath):
   """GetMTime returns the last modification time of the file or None."""
   try:
     return os.path.getmtime(FixPath(filepath))
   except OSError:
@@ skipping 130 matching lines @@
 
     self.inc_paths = ArgToList(options.incdirs)
     self.lib_paths = ArgToList(options.libdirs)
     self.define_list = ArgToList(options.defines)
 
     self.name = options.name
     self.BuildCompileOptions(options.compile_flags, self.define_list)
     self.BuildLinkOptions(options.link_flags)
     self.BuildArchiveOptions()
     self.verbose = options.verbose
-    self.suffix = options.suffix
     self.strip = options.strip
     self.empty = options.empty
     self.strip_all = options.strip_all
     self.strip_debug = options.strip_debug
     self.tls_edit = options.tls_edit
     self.finalize_pexe = options.finalize_pexe and arch == 'pnacl'
     goma_config = self.GetGomaConfig(options.gomadir, arch, toolname)
     self.gomacc = goma_config.get('gomacc', '')
     self.goma_burst = goma_config.get('burst', False)
     self.goma_threads = goma_config.get('threads', 1)
@@ skipping 187 matching lines @@
     except Exception as err:
       raise Error('%s\nFAILED: %s' % (' '.join(cmd_line), str(err)))
     finally:
       if temp_file is not None:
         RemoveFile(temp_file.name)
     return result
 
   def GetObjectName(self, src):
     if self.strip:
       src = src.replace(self.strip,'')
+    # Hash the full path of the source file and add 32 bits of that hash onto
+    # the end of the object file name.  This helps disambiguate files with the
+    # same name, because all of the object files are placed into the same
+    # directory.  Technically, the correct solution would be to preserve the
+    # directory structure of the input source files inside the object file
+    # directory, but doing that runs the risk of running into filename length
+    # issues on Windows.
+    h = hashlib.sha1()
+    h.update(src)
+    wart = h.hexdigest()[:8]
     _, filename = os.path.split(src)
     filename, _ = os.path.splitext(filename)
-    if self.suffix:
-      return os.path.join(self.outdir, filename + '.o')
-    else:
-      filename = os.path.split(src)[1]
-      return os.path.join(self.outdir, os.path.splitext(filename)[0] + '.o')
+    return os.path.join(self.outdir, filename + '_' + wart + '.o')
 
   def CleanOutput(self, out):
     if IsFile(out):
       RemoveFile(out)
 
   def FixWindowsPath(self, path):
     # The windows version of the nacl toolchain returns badly
     # formed system header paths. As we do want changes in the
     # toolchain to trigger rebuilds, compensate by detecting
     # malformed paths (starting with /libexec/) and assume these
@@ skipping 414 matching lines @@
     else:
       raise Error('FAILED: Unknown outtype: %s' % (self.outtype))
 
 
 def Main(argv):
   parser = OptionParser()
   parser.add_option('--empty', dest='empty', default=False,
                     help='Do not pass sources to library.', action='store_true')
   parser.add_option('--no-suffix', dest='suffix', default=True,
                     help='Do not append arch suffix.', action='store_false')
-  parser.add_option('--sufix', dest='suffix',
-                    help='Do append arch suffix.', action='store_true')
   parser.add_option('--strip-debug', dest='strip_debug', default=False,
                     help='Strip the NEXE for debugging', action='store_true')
   parser.add_option('--strip-all', dest='strip_all', default=False,
                     help='Strip the NEXE for production', action='store_true')
   parser.add_option('--strip', dest='strip', default='',
                     help='Strip the filename')
   parser.add_option('--nonstable-pnacl', dest='finalize_pexe', default=True,
                     help='Do not finalize pnacl bitcode for ABI stability',
                     action='store_false')
   parser.add_option('--source-list', dest='source_list',
@@ skipping 135 matching lines @@
       shutil.copy(objs[0], options.name)
     else:
       build.Generate(objs)
     return 0
   except Error as e:
     sys.stderr.write('%s\n' % e)
     return 1
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))