validator_ragel: Link into TCB, use under env var

tests/custom_desc/nacl.scons

 # -*- python -*-
 # Copyright 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')
 
 if 'TRUSTED_ENV' not in env:
   Return()
 trusted_env = env['TRUSTED_ENV']
 
 # This duplicates the library list in src/trusted/service_runtime/build.scons.
 # We would not have to do this if we could get Scons to track dependencies
 # between libraries.
 VALIDATOR_LIBS = []
 if trusted_env.Bit('target_x86'):
-  VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate')]
+  VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate'),
+                     trusted_env.NaClTargetArchSuffix('dfa_validate_caller'),
+                     trusted_env.NaClTargetArchSuffix('dfa_validate'),
+                     ]
 elif trusted_env.Bit('target_arm'):
   VALIDATOR_LIBS += ['ncvalidate_arm_v2']
 
 test_host = trusted_env.ComponentProgram(
     'desc_test_host', ['desc_test_host.c'],
     EXTRA_LIBS=['sel',
                 'sel_debug_dummy',
                 'manifest_proxy',
                 'simple_service',
                 'thread_interface',
@@ skipping 18 matching lines @@
   test_guest = env.GetTranslatedNexe(test_guest)
 
 test_command = [test_host, test_guest]
 bootstrap, _ = env.GetBootstrap()
 if bootstrap is not None:
   test_command = [bootstrap] + test_command
 
 node = env.CommandTest('custom_desc_test.out', test_command)
 env.AddNodeToTestSuite(node, ['small_tests'], 'run_custom_desc_test',
                        is_broken=not env.Bit('nacl_static_link'))