Build the IRT with nacl-clang for x86

toolchain_build/pnacl_sandboxed_translator.py

Index: toolchain_build/pnacl_sandboxed_translator.py
diff --git a/toolchain_build/pnacl_sandboxed_translator.py b/toolchain_build/pnacl_sandboxed_translator.py
index f7dcc1022dcc4c39bc20b6ca29c0e77ce19395f6..b467f95612b63bfd42dc2e8b6ecab9b6b24ff1f5 100644
--- a/toolchain_build/pnacl_sandboxed_translator.py
+++ b/toolchain_build/pnacl_sandboxed_translator.py
@@ -25,6 +25,9 @@ def GSDJoin(*args):
 def SandboxedTranslators(arches):
   le32_packages = ['newlib_le32', 'libcxx_le32', 'libs_support_le32',
                    'core_sdk_libs_le32', 'metadata', 'compiler_rt_bc_le32']
+  # These are required for building IRT-environment targets, which SCons does
+  # as a side effect of building the same targets in the le32 environment.

[jvoung (off chromium), 2015/03/19 17:36:26]

I don't really understand this one...

This is because we need the IRT headers and so on installed, and that's tied to
the IRT environ? Or is it the non-IRT private libs?

[Derek Schuff, 2015/03/19 18:36:17]

when you give a target of  say libnacl_sys_private to SCons, it builds that
target in all the environments where it's defined (i.e. both the IRT and pexe
environments). The IRT one was failing because it didn't have the native newlib
(even though it's actually the pexe one we want)

+  naclclang_packages = ['newlib_%s' % arch for arch in ['i686', 'x86_64','arm']]
   private_libs = ['libnacl_sys_private', 'libpthread_private', 'libplatform',
                   'libimc', 'libimc_syscalls', 'libsrpc', 'libgio']
   arch_packages = ['libs_support_translator', 'compiler_rt']
@@ -42,7 +45,8 @@ def SandboxedTranslators(arches):
       # are already built, so we copy those, and build the non-IRT libs here.
       'translator_compiler': {
         'type': 'work',
-        'dependencies': ['target_lib_compiler'] + le32_packages + arch_deps,
+        'dependencies': ['target_lib_compiler'] + (
+          le32_packages + arch_deps + naclclang_packages),
         'inputs': {
             'src_untrusted': os.path.join(NACL_DIR, 'src', 'untrusted'),
             'src_include': os.path.join(NACL_DIR, 'src', 'include'),
@@ -52,7 +56,8 @@ def SandboxedTranslators(arches):
         'commands': [
           # Copy the le32 bitcode libs

[jvoung (off chromium), 2015/03/19 17:36:26]

le32 bitcode libs and nacl-clang newlib packages?

[Derek Schuff, 2015/03/19 18:36:17]

Done.

           command.CopyRecursive('%(' + p + ')s', '%(output)s')
-           for p in ['target_lib_compiler'] + le32_packages] + [
+           for p in ['target_lib_compiler'] + (
+             le32_packages + naclclang_packages)] + [
           # Build the non-IRT libs
           command.Command([sys.executable, '%(scons.py)s',
               '--verbose', 'bitcode=1', 'platform=x86-32',