Subzero: Run sandboxed cross tests, and do some cleanup.

pydir/build-runtime.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import shutil
 import tempfile
 from utils import shellcmd
 from utils import FindBaseNaCl
 
 def Translate(ll_files, extra_args, obj, verbose):
@@ skipping 56 matching lines @@
                   '-pnacl-abi-simplify-postopt',
                   '-pnaclabi-allow-debug-metadata',
                   '{dir}/szrt.tmp.bc'.format(dir=tempdir),
                   '-S',
                   '-o', '{dir}/szrt.ll'.format(dir=tempdir)
             ], echo=args.verbose)
         ll_files = ['{dir}/szrt.ll'.format(dir=tempdir),
                     '{srcdir}/szrt_ll.ll'.format(srcdir=srcdir)]
         # Translate tempdir/szrt.ll and srcdir/szrt_ll.ll to szrt_native_x8632.o
         Translate(ll_files,
-                  ['-mtriple=i386-unknown-linux-gnu', '-mcpu=pentium4m'],
+                  ['-mtriple=i686', '-mcpu=pentium4m'],
                   '{rtdir}/szrt_native_x8632.o'.format(rtdir=rtdir),
                   args.verbose)
         # Translate tempdir/szrt.ll and srcdir/szrt_ll.ll to szrt_sb_x8632.o
         Translate(ll_files,
-                  ['-mtriple=i686-none-nacl-gnu', '-mcpu=pentium4m'],
+                  ['-mtriple=i686-nacl', '-mcpu=pentium4m'],
                   '{rtdir}/szrt_sb_x8632.o'.format(rtdir=rtdir),
                   args.verbose)
     finally:
         try:
             shutil.rmtree(tempdir)
         except OSError as exc:
             if exc.errno != errno.ENOENT: # ENOENT - no such file or directory
                 raise # re-raise exception
 
 if __name__ == '__main__':
     main()