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

src/trusted/validator_ragel/build.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 json
 import hashlib
 import os
 import platform
 import sys
@@ skipping 29 matching lines @@
 validator64 = env.ComponentObject('gen/validator_x86_64.c')
 
 features = [
     env.ComponentObject('validator_features_all.c'),
     env.ComponentObject('validator_features_validator.c')
 ]
 
 # Glue library called from service runtime. The source file depends on the
 # target architecture.  In library_deps.py this library is marked as
 # dependant of dfa_validate_x86_xx.
-if env.Bit('target_x86'):
+if env.Bit('build_x86'):
   caller_lib = 'dfa_validate_caller_x86_%s' % env.get('TARGET_SUBARCH')
   env.ComponentLibrary(
       caller_lib,
       ['dfa_validate_%s.c' % env.get('TARGET_SUBARCH'),
        {'32': validator32, '64': validator64}[env.get('TARGET_SUBARCH')],
        'dfa_validate_common.c',
        features])
 
 # Low-level platform-independent interface supporting both 32 and 64 bit,
 # used in ncval and in validator_benchmark.
@@ skipping 431 matching lines @@
 
 for bits in ['32', '64']:
   tests_mask = (
       '${MAIN_DIR}/src/trusted/validator_ragel/testdata/%s/*.test' % bits)
 
   if env.Bit('regenerate_golden'):
     update_option = ['--update']
   else:
     update_option = []
 
-  if env.Bit('target_x86'):
+  if env.Bit('build_x86'):
     # In principle we can run these tests on ARM too, but first, there is no
     # reason to, and second, there are problems with those bots that build
     # on one machine and run tests on another (build machine does not recognize
     # than new ncval is needed, so it's not copied to the test machine).
     rdfaval = '$STAGING_DIR/ncval_new$PROGSUFFIX'
     rdfa_targeted_test = env.AutoDepsCommand(
         'run_rdfa_targeted_tests_%s.out' % bits,
         ['${PYTHON}',
          env.File('run_rdfa_validator_tests.py'),
          '--rdfaval', env.File(rdfaval),
@@ skipping 40 matching lines @@
       ['small_tests', 'validator_tests'],
       node_name='run_spec_val_test_%s' % bits)
 
   if env.Bit('regenerate_golden'):
     # Don't want these tests run in parallel because they write
     # to .test files.
     SideEffect(tests_mask, spec_test)
 
     # Spec test uses @dis section in test files, which in turn is updated
     # by dis_section_test.
-    if env.Bit('target_x86'):
+    if env.Bit('build_x86'):
       env.Depends(spec_test, dis_section_test)