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

src/trusted/service_runtime/nacl.scons

 # -*- 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.
 
 Import('env')
 
 # All tests below involve native assembler
 
 HALT_SLED_SIZE=32
@@ skipping 17 matching lines @@
 # really a supported use of the PNaCl toolchain.  These tests are too
 # dependent on the layout that the linker happens to produce, so the tests
 # are likely to break or become ineffective if the linker is changed.
 if env.Bit('bitcode'):
   Return()
 
 # ----------------------------------------------------------
 # Tests that require a NaCl module
 # ----------------------------------------------------------
 
-if env.Bit('target_x86_32'):
+if env.Bit('build_x86_32'):
   nacl_text_pad_asm = 'arch/x86_32/nacl_text_pad_test.S'
-elif env.Bit('target_x86_64'):
+elif env.Bit('build_x86_64'):
   nacl_text_pad_asm = 'arch/x86_64/nacl_text_pad_test.S'
-elif env.Bit('target_arm'):
+elif env.Bit('build_arm'):
   nacl_text_pad_asm = 'arch/arm/nacl_text_pad_test.S'
-elif env.Bit('target_mips32'):
+elif env.Bit('build_mips32'):
   nacl_text_pad_asm = 'arch/mips/nacl_text_pad_test.S'
 else:
   raise Exception('unknown architecture')
 
 def NewAsmEnv(env, defines, rodata_address, rwdata_address):
   asm_env = env.Clone()
   # NOTE(robertm): convert this to pure C code so that most of this
   # special handling can be eliminated
   link_cmd = ('${LD} -static -e _start ${TEXT_START} ${RO_START} ${RW_START}' +
                 ' -o ${TARGET} ${SOURCES}')
 
-  if env.Bit('target_x86_32'):
+  if env.Bit('build_x86_32'):
     link_cmd += ' -melf_i386_nacl'
-  elif env.Bit('target_x86_64'):
+  elif env.Bit('build_x86_64'):
     link_cmd += ' -melf_x86_64_nacl'
-  elif env.Bit('target_arm'):
+  elif env.Bit('build_arm'):
     link_cmd += ' -marmelf_nacl'
-  elif env.Bit('target_mips32'):
+  elif env.Bit('build_mips32'):
     link_cmd += ' -mmipselelf_nacl'
   else:
     raise Exception('unknown architecture')
 
   asm_env['LINKCOM'] = link_cmd
 
   asm_env.Append(CPPDEFINES = [
                      ['NACL_BUILD_ARCH', '${BUILD_ARCHITECTURE}' ],
                      ['NACL_BUILD_SUBARCH', '${BUILD_SUBARCH}' ],
                  ])
@@ skipping 109 matching lines @@
         expected_exit_status = 'trusted_sigabrt'
     else:
       expected_exit_status = 0
 
     node = env.CommandSelLdrTestNacl(base_name + '.out', nexe,
                                      exit_status=expected_exit_status)
 
     env.AddNodeToTestSuite(node,
                            ['small_tests', 'sel_ldr_sled_tests'],
                            'run_' + base_name)