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

pydir/crosstest.py

Index: pydir/crosstest.py
diff --git a/pydir/crosstest.py b/pydir/crosstest.py
index 7b6eb0ee3fee53ee78c86314a7b6ef002f8df639..2efdca938e5f8a4dd6609183933554a33dca9d44 100755
--- a/pydir/crosstest.py
+++ b/pydir/crosstest.py
@@ -8,7 +8,7 @@ import tempfile
 
 import targets
 from szbuild import LinkNonsfi
-from utils import shellcmd, FindBaseNaCl, get_sfi_string
+from utils import GetObjcopyCmd, shellcmd, FindBaseNaCl, get_sfi_string

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

I would say alphabetize these, even though they weren't originally alphabetized.

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

ASCII alphabetized (uppercase before lowercase).

 
 def main():
     """Builds a cross-test binary for comparing Subzero and llc translation.
@@ -166,7 +166,7 @@ def main():
         # currently the only situation where multiple translated files are
         # linked into the executable, but when PNaCl supports shared nexe
         # libraries, this would need to change.
-        shellcmd(['{bin}/le32-nacl-objcopy'.format(bin=bindir),
+        shellcmd([('{bin}/' + GetObjcopyCmd()).format(bin=bindir),
                   '--weaken-symbol=__Sz_block_profile_info',
                   '--strip-symbol=nacl_tp_tdb_offset',
                   '--strip-symbol=nacl_tp_tls_offset',
@@ -180,7 +180,7 @@ def main():
                   '-bitcode-format=llvm',
                   '-o=' + obj_llc,
                   bitcode] + llc_flags)
-        shellcmd(['{bin}/le32-nacl-objcopy'.format(bin=bindir),
+        shellcmd([('{bin}/' + GetObjcopyCmd()).format(bin=bindir),
                   '--weaken-symbol=__Sz_block_profile_info',
                   '--strip-symbol=nacl_tp_tdb_offset',
                   '--strip-symbol=nacl_tp_tls_offset',
@@ -252,7 +252,7 @@ def main():
               '-o', obj_llc,
               bitcode] + llc_flags)
     if not args.sandbox and not args.nonsfi:
-        shellcmd(['{bin}/le32-nacl-objcopy'.format(bin=bindir),
+        shellcmd([('{bin}/' + GetObjcopyCmd()).format(bin=bindir),
                   '--redefine-sym', '_start=_user_start',
                   obj_llc
                  ])