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

site_scons/site_tools/naclsdk.py

Index: site_scons/site_tools/naclsdk.py
diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
index 71e18a57cb57d5047e605a3d2ce7db3d7f927b87..d083cc7d70d78f97fad1f87656ce94d3ad69c277 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -198,9 +198,6 @@ def _SetEnvForPnacl(env, root):
 
   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'
@@ -303,14 +300,14 @@ 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!")