Subzero: Fix dependency checking to avoid unnecessary rebuilds.

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 154 matching lines @@
     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 = 'llc'
+    llcbin = '{base}/pnacl-llc'.format(base=path_addition)
     gold = 'le32-nacl-ld.gold'
     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)):
         # Only run pnacl-translate in hybrid mode.
         shellcmd(['pnacl-translate',
@@ skipping 133 matching lines @@
     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 __name__ == '__main__':
     main()