Cleanup: Use Bit('build_ARCH') instead of Bit('target_ARCH')

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 319 matching lines @@
              ASPP=arch_flag + cc_flags,
              LINK=cc_flags) # Already has -arch
   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'))
+  assert(not env.Bit('build_mips32'))
 
   # 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')
   if env.Bit('built_elsewhere'):
     _StubOutEnvToolsForBuiltElsewhere(env)
   else:
     native_env = native_env.Clone(tools=['naclsdk'])
     if native_env.Bit('pnacl_generate_pexe'):
@@ skipping 14 matching lines @@
 # For example: __i686__, __arm__, __mips__, __x86_64__
 def AddBiasForPNaCl(env, temporarily_allow=True):
   assert(env.Bit('bitcode'))
   # re: the temporarily_allow flag -- that is for:
   # BUG= http://code.google.com/p/nativeclient/issues/detail?id=1248
   if env.Bit('pnacl_generate_pexe') and not temporarily_allow:
     env.Replace(CC='NO-NATIVE-CC-INVOCATION-ALLOWED',
                 CXX='NO-NATIVE-CXX-INVOCATION-ALLOWED')
     return
 
-  if env.Bit('target_arm'):
+  if env.Bit('build_arm'):
     bias_flag = '--pnacl-bias=arm'
-  elif env.Bit('target_x86_32'):
+  elif env.Bit('build_x86_32'):
     bias_flag = '--pnacl-bias=x86-32'
-  elif env.Bit('target_x86_64'):
+  elif env.Bit('build_x86_64'):
     bias_flag = '--pnacl-bias=x86-64'
-  elif env.Bit('target_mips32'):
+  elif env.Bit('build_mips32'):
     bias_flag = '--pnacl-bias=mips32'
   else:
     raise Exception("Unknown architecture!")
 
   if env.Bit('nonsfi_nacl'):
     bias_flag += '-nonsfi'
 
   env.AppendUnique(CCFLAGS=[bias_flag],
                    ASPPFLAGS=[bias_flag])
 
@@ skipping 290 matching lines @@
   root = env.GetToolchainDir()
 
   # if bitcode=1 use pnacl toolchain
   if env.Bit('bitcode'):
     _SetEnvForPnacl(env, root)
   elif env.Bit('built_elsewhere'):
     _StubOutEnvToolsForBuiltElsewhere(env)
   else:
     _SetEnvForNativeSdk(env, root)
 
-  if (env.Bit('bitcode') or env.Bit('nacl_clang')) and env.Bit('target_x86'):
+  if (env.Bit('bitcode') or env.Bit('nacl_clang')) and env.Bit('build_x86'):
     # Get GDB from the nacl-gcc toolchain even when using PNaCl.
     # TODO(mseaborn): We really want the nacl-gdb binary to be in a
     # separate tarball from the nacl-gcc toolchain, then this step
     # will not be necessary.
     # See http://code.google.com/p/nativeclient/issues/detail?id=2773
     temp_env = env.Clone()
     temp_env.ClearBits('bitcode', 'nacl_clang')
     temp_root = temp_env.GetToolchainDir()
     _SetEnvForNativeSdk(temp_env, temp_root)
     env.Replace(GDB=temp_env['GDB'])
@@ skipping 25 matching lines @@
     # translation.
     if not os.path.exists(version_file) or env.Bit('use_sandboxed_translator'):
       version_file = os.path.join(os.path.dirname(root), 'pnacl_translator',
                                   '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)