Build and use libraries locally in the nacl build, not requiring "partial SDK"

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # Copyright (c) 2011 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.
 
 """Nacl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 180 matching lines @@
   # Force -fPIC when compiling for shared libraries.
   env.AppendUnique(SHCCFLAGS=['-fPIC'],
                    )
 
 def _SetEnvForPnacl(env, root):
   arch = env['TARGET_FULLARCH']
   assert arch in ['arm', 'x86-32', 'x86-64']
 
   arch_flag = ' -arch %s' % arch
   shlibsuffix = '.so'
-  if env['BUILD_TYPE'] == 'nacl_extra_sdk':
-    arch_flag = ''
-    shlibsuffix = '.pso'
 
   env['PNACL_ROOT'] = root
   pnacl_sdk_lib = '${PNACL_ROOT}/libs-bitcode'
   #TODO(robertm): remove NACL_SDK_INCLUDE ASAP
   pnacl_sdk_include = '${PNACL_ROOT}/sysroot/include'
   pnacl_sdk_ar = '${PNACL_ROOT}/bin/pnacl-ar'
   pnacl_sdk_nm = '${PNACL_ROOT}/bin/pnacl-nm'
   pnacl_sdk_ranlib = '${PNACL_ROOT}/bin/pnacl-ranlib'
 
   pnacl_sdk_cc = '${PNACL_ROOT}/bin/pnacl-gcc'
@@ skipping 82 matching lines @@
   return native_env
 
 
 # This adds architecture specific defines for the target architecture.
 # These are normally omitted by PNaCl.
 # For example: __i686__, __arm__, __x86_64__
 def AddBiasForPNaCl(env):
   assert(env.Bit('bitcode'))
 
   if env.Bit('target_arm'):
-    env.Append(CCFLAGS=['--pnacl-arm-bias'])
-    env.Append(CXXFLAGS=['--pnacl-arm-bias'])
+    env.AppendUnique(CCFLAGS=['--pnacl-arm-bias'],
+                     CXXFLAGS=['--pnacl-arm-bias'])
   elif env.Bit('target_x86_32'):
-    env.Append(CCFLAGS=['--pnacl-i686-bias'])
-    env.Append(CXXFLAGS=['--pnacl-i686-bias'])
+    env.AppendUnique(CCFLAGS=['--pnacl-i686-bias'],
+                     CXXFLAGS=['--pnacl-i686-bias'])
   elif env.Bit('target_x86_64'):
-    env.Append(CCFLAGS=['--pnacl-x86_64-bias'])
-    env.Append(CXXFLAGS=['--pnacl-x86_64-bias'])
+    env.AppendUnique(CCFLAGS=['--pnacl-x86_64-bias'],
+                     CXXFLAGS=['--pnacl-x86_64-bias'])
   else:
     raise Exception("Unknown architecture!")
 
 
 def ValidateSdk(env):
   checkables = ['${NACL_SDK_INCLUDE}/stdio.h']
   for c in checkables:
     if os.path.exists(env.subst(c)):
       continue
     # Windows build does not use cygwin and so can not see nacl subdirectory
@@ skipping 74 matching lines @@
     # if bitcode=1 use pnacl toolchain
     if env.Bit('bitcode'):
       _SetEnvForPnacl(env, root)
     elif env.Bit('target_x86'):
       _SetEnvForX86Sdk(env, root)
     else:
       print "ERROR: unknown TARGET_ARCHITECTURE: ", env['TARGET_ARCHITECTURE']
       assert 0
 
   env.Prepend(LIBPATH='${NACL_SDK_LIB}')