Switch the nop pnacl x86-64 IRT shim to the real one generated from IDL.

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # Copyright (c) 2011 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 331 matching lines @@
 # Get an environment for nacl-gcc when in PNaCl mode.
 def PNaClGetNNaClEnv(env):
   assert(env.Bit('bitcode'))
   assert(not env.Bit('target_arm'))
 
   # This is kind of a hack. We clone the environment,
   # clear the bitcode bit, and then reload naclsdk.py
   native_env = env.Clone()
   native_env.ClearBits('bitcode')
   native_env = native_env.Clone(tools = ['naclsdk'])
+  # These are unfortunately clobbered by running Tool.
+  native_env.Replace(EXTRA_CFLAGS=env['EXTRA_CFLAGS'],
+                     EXTRA_CXXFLAGS=env['EXTRA_CXXFLAGS'],
+                     CCFLAGS=env['CCFLAGS'],
+                     CFLAGS=env['CFLAGS'],
+                     CXXFLAGS=env['CXXFLAGS'])
   return native_env
 
 
 # This adds architecture specific defines for the target architecture.
 # These are normally omitted by PNaCl.
 # For example: __i686__, __arm__, __x86_64__
 def AddBiasForPNaCl(env):
   assert(env.Bit('bitcode'))
 
   if env.Bit('target_arm'):
@@ skipping 182 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)