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

site_scons/site_tools/naclsdk.py

Index: site_scons/site_tools/naclsdk.py
diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
index 878f7f675540fbb1c3e6ac1886d58e27ebe8e55d..b99c29889c497b60d1e038d0808dc4ea5d8f325f 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -293,9 +293,6 @@ def _SetEnvForPnacl(env, root):
   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)
@@ -354,25 +351,6 @@ def _SetEnvForPnacl(env, root):
               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