Subzero: Use explicit paths to PNaCl tools invoked in szbuild.py.

pydir/szbuild.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import pipes
 import re
 import sys
 
 from utils import shellcmd
 from utils import FindBaseNaCl
@@ skipping 114 matching lines @@
 
     If no --include or --exclude arguments are given, the executable is produced
     entirely using Subzero, without using llc or linker tricks.
 
     This script uses file modification timestamps to determine whether llc and
     Subzero re-translation are needed.  It checks timestamps of llc, pnacl-sz,
     and the pexe against the translated object files to determine the minimal
     work necessary.  The --force option suppresses those checks and
     re-translates everything.
 
-    This script augments PATH so that various PNaCl and LLVM tools can be run.
-    These extra paths are within the native_client tree.  When changes are made
-    to these tools, copy them this way:
+    This script expects various PNaCl and LLVM tools to be found within the
+    native_client tree.  When changes are made to these tools, copy them this
+    way:
       cd native_client
       toolchain_build/toolchain_build_pnacl.py llvm_x86_64_linux \\
       --install=toolchain/linux_x86/pnacl_newlib_raw
     """
     argparser = argparse.ArgumentParser(
         description='    ' + main.__doc__,
         formatter_class=argparse.RawTextHelpFormatter)
     AddOptionalArgs(argparser)
     argparser.add_argument('pexe', help='Finalized pexe to translate')
     args = argparser.parse_args()
     pexe = args.pexe
     exe = args.output
     ProcessPexe(args, pexe, exe)
 
 def ProcessPexe(args, pexe, exe):
     [pexe_base, ext] = os.path.splitext(pexe)
     if ext != '.pexe':
         pexe_base = pexe
     pexe_base_unescaped = pexe_base
     pexe_base = pipes.quote(pexe_base)
     pexe = pipes.quote(pexe)
 
     nacl_root = FindBaseNaCl()
     path_addition = (
         '{root}/toolchain/linux_x86/pnacl_newlib_raw/bin'
         ).format(root=nacl_root)
-    os.environ['PATH'] = (
-        '{dir}{sep}{path}'
-        ).format(dir=path_addition, sep=os.pathsep, path=os.environ['PATH'])
     obj_llc = pexe_base + '.llc.o'
     obj_sz = pexe_base + '.sz.o'
     asm_sz = pexe_base + '.sz.s'
     obj_llc_weak = pexe_base + '.weak.llc.o'
     obj_sz_weak = pexe_base + '.weak.sz.o'
     obj_partial = obj_sz  # overridden for hybrid mode
     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 = 'le32-nacl-ld.gold'
-    objcopy = 'le32-nacl-objcopy'
+    gold = '{base}/le32-nacl-ld.gold'.format(base=path_addition)
+    objcopy = '{base}/le32-nacl-objcopy'.format(base=path_addition)
     opt_level = args.optlevel
     opt_level_map = { 'm1':'0', '-1':'0', '0':'0', '1':'1', '2':'2' }
     hybrid = args.include or args.exclude
 
     if hybrid and (args.force or
                    NewerThanOrNotThere(pexe, obj_llc) or
                    NewerThanOrNotThere(llcbin, obj_llc)):
         arch = {
           'arm32': 'armv7' if args.sandbox else 'arm-nonsfi',
           'x8632': 'x86-32' if args.sandbox else 'x86-32-linux',
         }[args.target]
 
         # Only run pnacl-translate in hybrid mode.
-        shellcmd(['pnacl-translate',
+        shellcmd(['{base}/pnacl-translate'.format(base=path_addition),
                   '-split-module=1',
                   '-ffunction-sections',
                   '-fdata-sections',
                   '-c',
                   '-arch',  arch,
                   '-O' + opt_level_map[opt_level],
                   '--pnacl-driver-append-LLC_FLAGS_EXTRA=-externalize',
                   '-o', obj_llc] +
                  (['--pnacl-driver-verbose'] if args.verbose else []) +
                  args.llc_args +
@@ skipping 152 matching lines @@
             '{{unsandboxed_irt,irt_random,irt_query_list}}.o ' +
             '{root}/toolchain_build/src/subzero/build/runtime/' +
             'szrt_native_{target}.o -lpthread -lrt ' +
             '-Wl,--defsym=__Sz_AbsoluteZero=0'
             ).format(ld=linker, ld_extra_args=extra_linker_args,
                      partial=obj_partial, exe=exe, root=nacl_root,
                      target=args.target, lib_dir=lib_dir),
                  echo=args.verbose)
 
     # Put the extra verbose printing at the end.
-    if args.verbose:
-        print 'PATH: {path}'.format(path=path_addition)
-        if 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 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()