Non-SFI mode: Implement nacl_irt_random only for nacl_helper_nonsfi.

src/untrusted/nacl/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')
 
 # NACL_GC_WRAP_SYSCALL uses ({...}) syntax.
 env.FilterOut(CCFLAGS=['-pedantic'])
@@ skipping 249 matching lines @@
 env.AddLibraryToSdk(libnacl_exception)
 env.ComponentLibrary('libnacl_exception_private', ['nacl_exception_private.c'])
 
 libnacl_list_mappings = env.NaClSdkLibrary(
     'libnacl_list_mappings', ['list_mappings.c'])
 env.AddLibraryToSdk(libnacl_list_mappings)
 env.AddHeaderToSdk(['nacl_list_mappings.h'])
 env.ComponentLibrary(
     'libnacl_list_mappings_private', ['list_mappings_private.c'])
 
-env.ComponentLibrary(
-    'libnacl_random_private',
-    [env.ComponentObject('irt_random',
-                         '${MAIN_DIR}/src/untrusted/irt/irt_random.c'),
-     env.ComponentObject('irt_nameservice',
-                         '${MAIN_DIR}/src/untrusted/irt/irt_nameservice.c')])
+if not env.Bit('nonsfi_nacl'):
+  env.ComponentLibrary(
+      'libnacl_random_private',
+      [env.ComponentObject('irt_random',
+                           '${MAIN_DIR}/src/untrusted/irt/irt_random.c'),
+       env.ComponentObject('irt_nameservice',
+                           '${MAIN_DIR}/src/untrusted/irt/irt_nameservice.c')])
 
 
 imc_syscalls = [
     'imc_accept.c',
     'imc_connect.c',
     'imc_makeboundsock.c',
     'imc_mem_obj_create.c',
     'imc_recvmsg.c',
     'imc_sendmsg.c',
     'imc_socketpair.c',
@@ skipping 24 matching lines @@
   # single .o file avoids this scenario.
   private_combine = [env.ComponentObject(module, '%s.c' % module)
                      for module in ['gc_hooks_private',
                                     'sys_private']]
   sys_private.append(env.Command('combined_private${OBJSUFFIX}',
                                  private_combine,
                                  '${LD} -relocatable -o ${TARGET} ${SOURCES}'))
 
 if not env.Bit('nonsfi_nacl'):
   env.ComponentLibrary('libnacl_sys_private', sys_private)