Enable using the toolchain (llvm) provided FileCheck.

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """NaCl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 98 matching lines @@
               #                passes arguments to scons
               NACL_SDK_INCLUDE='%s/%s/include' % (sdk_path, tool_prefix),
               # where to find/put nacl generic extra sdk libraries
               NACL_SDK_LIB='%s/%s' % (sdk_path, libdir),
               # Replace the normal unix tools with the NaCl ones.
               CC=os.path.join(bin_path, '%s-%s' % (tool_prefix, cc)),
               CXX=os.path.join(bin_path, '%s-%s' % (tool_prefix, cxx)),
               AR=os.path.join(bin_path, '%s-ar' % tool_prefix),
               AS=os.path.join(bin_path, '%s-as' % tool_prefix),
               ASPP=os.path.join(bin_path, '%s-%s' % (tool_prefix, cc)),
+              FILECHECK=os.path.join(bin_path, '%s-FileCheck' % tool_prefix),

[Derek Schuff, 2015/03/23 16:25:07]

The util binaries don't have the tool_prefix on their filenames.

[Mircea Trofin, 2015/03/23 17:27:20]

Done.

               GDB=os.path.join(bin_path, '%s-gdb' % tool_prefix),
               # NOTE: use g++ for linking so we can handle C AND C++.
               LINK=os.path.join(bin_path, '%s-%s' % (tool_prefix, cxx)),
               # Grrr... and sometimes we really need ld.
               LD=os.path.join(bin_path, '%s-ld' % tool_prefix) + ld_mode_flag,
               RANLIB=os.path.join(bin_path, '%s-ranlib' % tool_prefix),
               NM=os.path.join(bin_path, '%s-nm' % tool_prefix),
               OBJDUMP=os.path.join(bin_path, '%s-objdump' % tool_prefix),
               OBJCOPY=os.path.join(bin_path, '%s-objcopy' % tool_prefix),
               STRIP=os.path.join(bin_path, '%s-strip' % tool_prefix),
@@ skipping 57 matching lines @@
     elif env.Bit('build_x86_64'):
       llc_cpu = 'x86_64'
 
     if env.Bit('host_linux'):
       llc_mtriple_flag = ' -mtriple=%s-linux-gnu' % llc_cpu
     elif env.Bit('host_mac'):
       llc_mtriple_flag = ' -mtriple=%s-apple-darwin' % llc_cpu
 
   translator_root = os.path.join(os.path.dirname(root), 'pnacl_translator')
 
-  binprefix = os.path.join(root, 'bin', 'pnacl-')
+  binroot = os.path.join(root, 'bin')
+  binprefix = os.path.join(binroot, 'pnacl-')
   binext = ''
   if env.Bit('host_windows'):
     binext = '.bat'
 
   pnacl_ar = binprefix + 'ar' + binext
   pnacl_as = binprefix + 'as' + binext
   pnacl_nm = binprefix + 'nm' + binext
   pnacl_ranlib = binprefix + 'ranlib' + binext
   # Use the standalone sandboxed translator in sbtc mode
   if env.Bit('use_sandboxed_translator'):
     pnacl_translate = os.path.join(translator_root, 'bin',
                                    'pnacl-translate' + binext)
   else:
     pnacl_translate = binprefix + 'translate' + binext
 
   pnacl_cc = binprefix + 'clang' + binext
   pnacl_cxx = binprefix + 'clang++' + binext
 
   pnacl_ld = binprefix + 'ld' + binext
   pnacl_disass = binprefix + 'dis' + binext
+  pnacl_filecheck = os.path.join(binroot, 'FileCheck')
   pnacl_finalize = binprefix + 'finalize' + binext
   pnacl_opt = binprefix + 'opt' + binext
   pnacl_strip = binprefix + 'strip' + binext
   pnacl_llc = binprefix + 'llc' + binext
 
   # NOTE: XXX_flags start with space for easy concatenation
   # The flags generated here get baked into the commands (CC, CXX, LINK)
   # instead of CFLAGS etc to keep them from getting blown away by some
   # tests. Don't add flags here unless they always need to be preserved.
   pnacl_cxx_flags = ''
@@ skipping 55 matching lines @@
               LINK=pnacl_cxx + ld_arch_flag + pnacl_ld_flags,
               # Although we are currently forced to produce native output
               # for LINK, we are free to produce bitcode for SHLINK
               # (SharedLibrary linking) because scons doesn't do anything
               # with shared libraries except use them with the toolchain.
               SHLINK=pnacl_cxx + ld_arch_flag + pnacl_ld_flags,
               LD=pnacl_ld,
               AR=pnacl_ar,
               AS=pnacl_as + ld_arch_flag,
               RANLIB=pnacl_ranlib,
+              FILECHECK=pnacl_filecheck,
               DISASS=pnacl_disass,
               OBJDUMP=pnacl_disass,
               STRIP=pnacl_strip,
               TRANSLATE=pnacl_translate + arch_flag + pnacl_translate_flags,
               PNACLFINALIZE=pnacl_finalize,
               PNACLOPT=pnacl_opt,
               LLC=pnacl_llc + llc_mtriple_flag + pnacl_llc_flags,
               )
 
   if env.Bit('built_elsewhere'):
@@ skipping 425 matching lines @@
     # translation.
     if not os.path.exists(version_file) or env.Bit('use_sandboxed_translator'):
       version_file = os.path.join(os.path.dirname(root), 'pnacl_translator',
                                   'FEATURE_VERSION')
     if os.path.exists(version_file):
       with open(version_file, 'r') as fh:
         version = int(fh.read())
     else:
       version = 0
   env.Replace(TOOLCHAIN_FEATURE_VERSION=version)