Add a scons pnacl finalize step for pnacl_generate_pexe tests.

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 273 matching lines @@
                                    '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_nativeld = binprefix + 'nativeld' + binext
   pnacl_disass = binprefix + 'dis' + binext
+  pnacl_finalize = binprefix + 'finalize' + binext
   pnacl_strip = binprefix + 'strip' + binext
   pnacl_nmf = binprefix + 'nmf' + binext
   pnacl_link_and_translate = os.path.join(subroot,
                                           'bin',
                                           'wrapper-link-and-translate') + 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.
@@ skipping 41 matching lines @@
               LD=pnacl_ld,
               NATIVELD=pnacl_nativeld,
               AR=pnacl_ar,
               AS=pnacl_as + ld_arch_flag,
               RANLIB=pnacl_ranlib,
               DISASS=pnacl_disass,
               OBJDUMP=pnacl_disass,
               STRIP=pnacl_strip,
               GENNMF=pnacl_nmf,
               TRANSLATE=pnacl_translate + arch_flag + pnacl_translate_flags,
+              PNACLFINALIZE=pnacl_finalize,
               )
 
   if env.Bit('pnacl_shared_newlib'):
     def shlibemitter(target, source, env):
       """when building a .so also notify scons that we care about
       the .pso which gets generated as a side-effect and which should
       also be installed.
       This is a not very well documented scons API.
       """
       if env.Bit('pnacl_generate_pexe'):
         return (target, source)
       assert len(target) == 1
       lib = env.GetBuildPath(target[0])
       assert lib.endswith(".so")
       return (target + [lib[:-2] + 'pso'], source)
 
     env.Replace(LINK=pnacl_link_and_translate + arch_flag + ' -dynamic',
                 SHLINK=pnacl_link_and_translate + arch_flag,
                 SHLIBEMITTER=shlibemitter)
 
 
   if env.Bit('built_elsewhere'):
     def FakeInstall(dest, source, env):
       print 'Not installing', dest
     _StubOutEnvToolsForBuiltElsewhere(env)
     env.Replace(INSTALL=FakeInstall)
     if env.Bit('translate_in_build_step'):
       env.Replace(TRANSLATE='true')
+    env.Replace(PNACLFINALIZE='true')
 
 
 def _SetEnvForSdkManually(env):
   def GetEnvOrDummy(v):
     return os.getenv('NACL_SDK_' + v, 'MISSING_SDK_' + v)
 
   env.Replace(# Replace header and lib paths.
               NACL_SDK_INCLUDE=GetEnvOrDummy('INCLUDE'),
               NACL_SDK_LIB=GetEnvOrDummy('LIB'),
               # Replace the normal unix tools with the NaCl ones.
@@ skipping 313 matching lines @@
       psdk_mode)
 
   # Invoke the various unix tools that the NativeClient SDK resembles.
   env.Tool('g++')
   env.Tool('gcc')
   env.Tool('gnulink')
   env.Tool('ar')
   env.Tool('as')
 
   if env.Bit('pnacl_generate_pexe'):
-    suffix = '.pexe'
+    suffix = '.nonfinal.pexe'
   else:
     suffix = '.nexe'
 
   env.Replace(
       COMPONENT_LINKFLAGS=[''],
       COMPONENT_LIBRARY_LINK_SUFFIXES=['.pso', '.so', '.a'],
       _RPATH='',
       COMPONENT_LIBRARY_DEBUG_SUFFIXES=[],
       PROGSUFFIX=suffix,
       # adding BASE_ AND EXTRA_ flags to common command lines
@@ skipping 18 matching lines @@
 
       LINKCOM='$LINK $BASE_LINKFLAGS $LINKFLAGS $EXTRA_LINKFLAGS ' +
               '$SOURCES $_LIBDIRFLAGS $_LIBFLAGS -o $TARGET',
       SHLINKCOM='$SHLINK $BASE_LINKFLAGS $SHLINKFLAGS $EXTRA_LINKFLAGS ' +
                 '$SOURCES $_LIBDIRFLAGS $_LIBFLAGS -o $TARGET',
 
       ASCOM='$AS $BASE_ASFLAGS $ASFLAGS $EXTRA_ASFLAGS -o $TARGET $SOURCES',
       ASPPCOM='$ASPP $BASE_ASPPFLAGS $ASPPFLAGS $EXTRA_ASPPFLAGS ' +
               '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES',
 
-        # Strip doesn't seem to be a first-class citizen in SCons country,
+      # Strip doesn't seem to be a first-class citizen in SCons country,
       # so we have to add these *COM, *COMSTR manually.
       # Note: it appears we cannot add this in component_setup.py
       STRIPFLAGS=['--strip-all'],
       STRIPCOM='${STRIP} ${STRIPFLAGS}',
       TRANSLATEFLAGS=['-Wl,-L${LIB_DIR}'],
       TRANSLATECOM='${TRANSLATE} ${TRANSLATEFLAGS} ${SOURCES} -o ${TARGET}',
+      PNACLFINALIZEFLAGS=[],
+      PNACLFINALIZECOM='${PNACLFINALIZE} ${PNACLFINALIZEFLAGS} ' +
+                       '${SOURCES} -o ${TARGET}',
   )
 
   # Windows has a small limit on the command line size.  The linking and AR
   # commands can get quite large.  So bring in the SCons machinery to put
   # most of a command line into a temporary file and pass it with
   # @filename, which works with gcc.
   if env['PLATFORM'] in ['win32', 'cygwin']:
     env['TEMPFILE'] = NaClTempFileMunge
     for com in ['LINKCOM', 'SHLINKCOM', 'ARCOM']:
       env[com] = "${TEMPFILE('%s')}" % env[com]
@@ skipping 30 matching lines @@
   # Dependency files it produces are to be found in ${LIBPATH}.
   # It is applied recursively to those dependencies in case
   # some of them are linker scripts too.
   ldscript_scanner = SCons.Scanner.Base(
       function=ScanLinkerScript,
       skeys=['.a', '.so', '.pso'],
       path_function=SCons.Scanner.FindPathDirs('LIBPATH'),
       recursive=True
       )
   env.Append(SCANNERS=ldscript_scanner)