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 170 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('posix') and not env.Bit('nonsfi_nacl'):

[Mark Seaborn, 2014/11/04 01:19:52]

Should just be "if not env.Bit('nonsfi_nacl')" to match libnacl_sys_private
below.

[hidehiko, 2014/11/04 11:16:59]

This is the condition for the nonsfi nacl_random_private lib, checked in
src/nonsfi/irt/build.scons.
Please let me keep them consistent.

BTW, IIUC, posix bit seems always on if nonsfi_nacl bit is set, right? If so
I'll clean them up.

[Mark Seaborn, 2014/11/05 19:01:15]

I still think you should remove the env.Bit('posix') check.

'posix' is will either be always-true or always-false in this file, so there's
no reason to check it.  (I think it's always-false.)

The only reason that src/nonsfi/irt/build.scons checks 'posix' is that this file
is used in *two* contexts by SConstruct:
 * building with a NaCl toolchain
 * building with a host-OS toolchain
and we want to exclude building it on Windows.

(That double usage is unusual, BTW.  Normally we have separate build.scons and
nacl.scons files for those cases.)

But src/untrusted/nacl/nacl.scons is only ever built with a NaCl toolchain,
never with a host-OS toolchain.

[hidehiko, 2014/11/06 13:22:24]

I see. Thank you for clarification. Removed "posix".

+  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)