[NaCl SDK] Prune some unneeded parts of the PNaCl toolchain.

native_client_sdk/src/build_tools/build_sdk.py

Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 190e5c33f70dbd3a16264c6a5cda87d9433b3b54..982c2ac681c6863172d134af388f769cb540e4c6 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -186,6 +186,18 @@ def BuildStepCopyTextFiles(pepperdir, pepper_ver, chrome_revision,
   open(os.path.join(pepperdir, 'README'), 'w').write(readme_text)
 
 
+def PrunePNaClToolchain(root):
+  dirs_to_prune = [
+    'newlib/lib-bc-x86-64',
+    'newlib/usr-bc-x86-64'
+    # TODO(sbc): remove this once its really not needed.
+    # Currently we seem to rely on it at least for <bits/stat.h>

[eliben, 2013/08/10 00:49:08]

Hmm, this is weird :-/

+    #'newlib/sysroot',
+  ]
+  for dirname in dirs_to_prune:
+    buildbot_common.RemoveDir(os.path.join(root, dirname))
+
+
 def BuildStepUntarToolchains(pepperdir, arch, toolchains):
   buildbot_common.BuildStep('Untar Toolchains')
   platform = getos.GetPlatform()
@@ -236,6 +248,7 @@ def BuildStepUntarToolchains(pepperdir, arch, toolchains):
     # Then rename/move it to the pepper toolchain directory
     pnacldir = os.path.join(pepperdir, 'toolchain', tcname + '_pnacl')
     buildbot_common.Move(tmpdir, pnacldir)
+    PrunePNaClToolchain(pnacldir)
 
   buildbot_common.RemoveDir(tmpdir)