Remove some unused references to the pnacl-nativeld tool

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 180 matching lines @@
   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_nativeld = binprefix + 'nativeld' + binext
   pnacl_disass = binprefix + 'dis' + binext
   pnacl_finalize = binprefix + 'finalize' + binext
   pnacl_strip = binprefix + 'strip' + 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'
@@ skipping 33 matching lines @@
               SHLIBPREFIX="lib",
               SHLIBSUFFIX=".so",
               OBJSUFFIX=".bc",
               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,
-              NATIVELD=pnacl_nativeld,
               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,
               )
 
@@ skipping 15 matching lines @@
     return
 
   env.Replace(OBJSUFFIX='.o',
               SHLIBSUFFIX='.so')
   arch_flag = ' -arch ${TARGET_FULLARCH}'
   cc_flags = ' --pnacl-allow-native --pnacl-allow-translate'
   env.Append(CC=arch_flag + cc_flags,
              CXX=arch_flag + cc_flags,
              ASPP=arch_flag + cc_flags,
              LINK=cc_flags) # Already has -arch
-  env['LD'] = '${NATIVELD}' + arch_flag
+  env['LD'] = 'NO-NATIVE-LD-INVOCATION-ALLOWED'
   env['SHLINK'] = '${LINK}'
   if env.Bit('built_elsewhere'):
     _StubOutEnvToolsForBuiltElsewhere(env)
 
 # Get an environment for nacl-gcc when in PNaCl mode.
 def PNaClGetNNaClEnv(env):
   assert(env.Bit('bitcode'))
   assert(not env.Bit('target_mips32'))
 
   # This is kind of a hack. We clone the environment,
@@ skipping 377 matching lines @@
   if 'toolchain_feature_version' in SCons.Script.ARGUMENTS:
     version = int(SCons.Script.ARGUMENTS['toolchain_feature_version'])
   else:
     version_file = os.path.join(root, '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)