Change built_elsewhere flag to work with pexe mode

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 307 matching lines @@
               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,
               )
 
+  if env.Bit('built_elsewhere'):
+    def FakeInstall(dest, source, env):
+      print 'Not installing', dest
+    env.Replace(CC='true', CXX='true', LINK='true', AR='true',

[robertm, 2012/03/22 14:09:37]

if it is not too much work it be nice to make the faked out
command more verbose, e.g.

 'Skip CC', dest
'Skip CXX', dest

etc

[(google.com) Derek Schuff, 2012/03/22 16:10:25]

How would that work? Will it work if I just pass a python function here instead
of a shell command?

On 2012/03/22 14:09:37, robertm wrote:

[robertm, 2012/03/22 16:18:43]

not sure. 
another option could be CC='echo CC #' where the purpose of the '#' is to ignore
the command line.
if the simple stuff does not work don't bother

On 2012/03/22 16:10:25, Derek Schuff wrote:

+                RANLIB='true', AS='true', LD='true',
+                STRIP='true', INSTALL=FakeInstall,
+                #TODO(dschuff) remove this when we can translate on arm hw
+                TRANSLATE='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.
               CC=GetEnvOrDummy('CC'),
@@ skipping 14 matching lines @@
   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['SHLINK'] = '${LINK}'
+  if env.Bit('built_elsewhere'):
+    env.Replace(CC='true', CXX='true', ASPP='true', LINK='true', LD='true')

[jvoung - send to chromium..., 2012/03/22 00:17:45]

Should this be done earlier?  Mainly concerned with how this interacts with the
pnacl_generate_pexe check above (with an early return).

[robertm, 2012/03/22 14:09:37]

if this ends up staying around you could unify this with the similar statement
above.

On 2012/03/22 00:17:45, jvoung wrote:

[(google.com) Derek Schuff, 2012/03/22 16:10:25]

The change above is for the nacl environment and applies in both pexe and
non-pexe mode. This change only applies in non-pexe mode since this function
should not be called otherwise (hence the check above). This change is just
necessary because the change to the way built_elsewhere is implemented affects
both pexe and non-pexe mode.

On 2012/03/22 00:17:45, jvoung wrote:

 
 # Get an environment for a different frontend when in
 # PNaCl mode.
 def PNaClChangeFrontend(env, frontend):
   assert(env.Bit('bitcode'))
   assert(frontend in ('clang','dragonegg'))
 
   # This is kind of a hack.
   alt_env = env.Clone()
   alt_env['PNACL_FRONTEND'] = frontend
   alt_env = alt_env.Clone(tools = ['naclsdk'])
   return alt_env
 
 
 # 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'])
   if native_env.Bit('pnacl_generate_pexe'):
     native_env.Replace(CC='NO-NATIVE-CC-INVOCATION-ALLOWED',
                        CXX='NO-NATIVE-CXX-INVOCATION-ALLOWED')

[jvoung - send to chromium..., 2012/03/22 00:17:45]

I assume this worked too since I think toolchain tests should include something
that used PNaClGetNNaClEnv ?

[(google.com) Derek Schuff, 2012/03/22 16:10:25]

It did work when I tested, but I added a case here as well just to be sure.
On 2012/03/22 00:17:45, jvoung wrote:

   else:
     # 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
 
 
@@ skipping 211 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)