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

src/untrusted/pthread/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')
 
 # (elijahtaylor): Removing so braced groups will work for GC syscall wrapping.
 env.FilterOut(CCFLAGS=['-pedantic'])
 
 if env.Bit('bitcode'):
   # TODO(robertm): get rid of -allow-asm once we can distinguish
   #                real asms from those used for redirects.
   #                In this case:  asm("llvm.nacl.tp.tdb.offset")
   #                from src/untrusted/nacl/tls_params.h
   env.Append(CCFLAGS=['-allow-asm'])
 
 if env.Bit('nonsfi_nacl'):
   # Specifying the target arch is necessary for using inline assembly
   # in non-SFI code.
-  if env.Bit('target_x86_32'):
+  if env.Bit('build_x86_32'):
     env.Append(CCFLAGS=['--target=i686-unknown-nacl'])
-  elif env.Bit('target_arm'):
+  elif env.Bit('build_arm'):
     env.Append(CCFLAGS=['--target=armv7-unknown-nacl-gnueabihf',
                         '-mfloat-abi=hard'])
   else:
     raise Exception('Unsupported architecture')
 
 valgrind = env.ComponentObject(
     'valgrind_annotations.o',
     '${MAIN_DIR}/src/untrusted/valgrind/dynamic_annotations.c')
 
 nc_objs = [env.ComponentObject(module, module + '.c')
@@ skipping 42 matching lines @@
   # installed, we ensure that they are in place before they're used.
   for compiler in ['${CC}', '${CXX}']:
     # TODO(mcgrathr): This can't be the best way!  Ideally we'd just use
     # '${CC}' directly in env.Depends and that should be fine for scons.
     # But sometimes '${CC}' is not just '.../gcc', it's '.../gcc -m32'.
     compiler = env.subst(compiler).split()[0]
     env.Depends(env.WhereIs(compiler), n)
 else:
   n = []
 env.Alias('install_libpthread', n)