Eliminate all uses of 'le32-nacl-objcopy'.

pydir/szbuild.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import pipes
 import re
 import sys
 
-from utils import shellcmd, FindBaseNaCl, get_sfi_string
+from utils import GetObjcopyCmd, shellcmd, FindBaseNaCl, get_sfi_string
 
 def NewerThanOrNotThere(old_path, new_path):
     """Returns whether old_path is newer than new_path.
 
     Also returns true if either path doesn't exist.
     """
     if not (os.path.exists(old_path) and os.path.exists(new_path)):
         return True
     return os.path.getmtime(old_path) > os.path.getmtime(new_path)
 
@@ skipping 266 matching lines @@
     sym_llc = pexe_base + '.sym.llc.txt'
     sym_sz = pexe_base + '.sym.sz.txt'
     sym_sz_unescaped = pexe_base_unescaped + '.sym.sz.txt'
     whitelist_sz = pexe_base + '.wl.sz.txt'
     whitelist_sz_unescaped = pexe_base_unescaped + '.wl.sz.txt'
     pnacl_sz = (
         '{root}/toolchain_build/src/subzero/pnacl-sz'
         ).format(root=nacl_root)
     llcbin = '{base}/pnacl-llc'.format(base=path_addition)
     gold = '{base}/le32-nacl-ld.gold'.format(base=path_addition)
-    objcopy = '{base}/le32-nacl-objcopy'.format(base=path_addition)
+    objcopy = ('{base}/' + GetObjcopyCmd()).format(base=path_addition)

[Jim Stichnoth, 2016/03/09 22:41:13]

'{base}/{objcopy}'.format(base=path_addition, objcopy=GetObjcopyCmd())

Same for crosstest.py.

[Sean Klein, 2016/03/09 22:59:22]

Done.

     opt_level = args.optlevel
     opt_level_map = { 'm1':'0', '-1':'0', '0':'0', '1':'1', '2':'2' }
     hybrid = args.include or args.exclude
     native = not args.sandbox and not args.nonsfi
 
     if hybrid and (args.force or
                    NewerThanOrNotThere(pexe, obj_llc) or
                    NewerThanOrNotThere(llcbin, obj_llc)):
         arch = {
           'arm32': 'arm' + get_sfi_string(args, 'v7', '-nonsfi', '-nonsfi'),
@@ skipping 142 matching lines @@
 
     # Put the extra verbose printing at the end.
     if args.verbose and hybrid:
         print 'include={regex}'.format(regex=re_include_str)
         print 'exclude={regex}'.format(regex=re_exclude_str)
         print 'default_match={dm}'.format(dm=default_match)
         print 'Number of Subzero syms = {num}'.format(num=len(sz_syms))
 
 if __name__ == '__main__':
     main()