Route the buiding of libnosys, libpthread through NaClSdkLibrary.

SConstruct

 #! -*- 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 atexit
 import glob
 import os
 import platform
 import shutil
@@ skipping 3398 matching lines @@
 
 def NaClSharedLibrary(env, lib_name, *args, **kwargs):
   env_shared = env.Clone(COMPONENT_STATIC=False)
   soname = SCons.Util.adjustixes(lib_name, 'lib', '.so')
   env_shared.AppendUnique(SHLINKFLAGS=['-Wl,-soname,%s' % (soname)])
   return env_shared.ComponentLibrary(lib_name, *args, **kwargs)
 
 nacl_env.AddMethod(NaClSharedLibrary)
 
 def NaClSdkLibrary(env, lib_name, *args, **kwargs):
+  gen_shared = not env.Bit('nacl_disable_shared')
+  if 'no_shared_lib' in kwargs:
+    if kwargs['no_shared_lib']:

[jvoung - send to chromium..., 2012/05/22 20:49:40]

Can't you still add a arg with a default value, instead of using kwargs, or is
that too confusing, e.g.,:

def foo(env, lib_name, no_shared_lib=False, *name, **kwargs):

[Robert Muth (chromium), 2012/05/22 21:16:36]

Sadly you cannot mix args that way in python
The only clean alternative would be to add a real argument. But that would
require changing all NaClSdkLibrary() uses

[jvoung - send to chromium..., 2012/05/22 23:22:13]

Well it worked on a simple example I tried, but there is probably some subtle
python rule where it would break so... yeah let's not mix them.

+      gen_shared = False
+    del kwargs['no_shared_lib']
   n = [env.ComponentLibrary(lib_name, *args, **kwargs)]
-  if not env.Bit('nacl_disable_shared'):
+  if gen_shared:
     n.append(NaClSharedLibrary(env, lib_name, *args, **kwargs))
   return n
 
 nacl_env.AddMethod(NaClSdkLibrary)
 
 
 # ---------------------------------------------------------------------
 # Special environment for untrusted test binaries that use raw syscalls
 # ---------------------------------------------------------------------
 def RawSyscallObjects(env, sources):
@@ skipping 424 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')