Remove wrapper-link-and-translate from PNaCl and pnacl_shared_newlib from SCons.

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 275 matching lines @@
     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_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.
   pnacl_cxx_flags = ''
   pnacl_cc_flags = ' -std=gnu99'
   pnacl_ld_flags = ' ' + ' '.join(env['PNACL_BCLDFLAGS'])
   pnacl_translate_flags = ''
 
@@ skipping 38 matching lines @@
               AR=pnacl_ar,
               AS=pnacl_as + ld_arch_flag,
               RANLIB=pnacl_ranlib,
               DISASS=pnacl_disass,
               OBJDUMP=pnacl_disass,
               STRIP=pnacl_strip,
               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')
 
 
@@ skipping 421 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)