Add configure/CMake flags for conditionally building subzero targets.

toolchain_build/toolchain_build_pnacl.py

 #!/usr/bin/python
 # Copyright (c) 2013 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.
 
 """Recipes for PNaCl toolchain packages.
 
    Recipes consist of specially-structured dictionaries, with keys for package
    name, type, commands to execute, etc. The structure is documented in the
    PackageBuilder docstring in toolchain_main.py.
@@ skipping 654 matching lines @@
                   '-DLLVM_BINUTILS_INCDIR=%(abs_binutils_pnacl_src)s/include',
                   '-DLLVM_BUILD_TESTS=ON',
                   '-DLLVM_ENABLE_ASSERTIONS=ON',
                   '-DLLVM_ENABLE_LIBCXX=OFF',
                   '-LLVM_ENABLE_WERROR=' + ('ON' if llvm_do_werror else 'OFF'),
                   '-DLLVM_ENABLE_ZLIB=OFF',
                   '-DLLVM_EXTERNAL_CLANG_SOURCE_DIR=%(clang_src)s',
                   '-DLLVM_EXTERNAL_SUBZERO_SOURCE_DIR=%(subzero_src)s',
                   '-DLLVM_INSTALL_UTILS=ON',
                   '-DLLVM_TARGETS_TO_BUILD=X86;ARM;Mips;JSBackend',
+                  '-DSUBZERO_TARGETS_TO_BUILD=X8632;ARM32',
                   '%(llvm_src)s'],
                   # Older CMake ignore CMAKE_*_LINKER_FLAGS during config step.
                   # https://public.kitware.com/Bug/view.php?id=14066
                   # The workaround is to set LDFLAGS in the environment.
                   # TODO(jvoung): remove the ability to override env vars
                   # from "command" once the CMake fix propagates and we can
                   # stop using this env var hack.
                   env={'LDFLAGS' : ' '.join(
                         HostArchToolFlags(host, [], options)['LDFLAGS'])})] +
               CopyHostLibcxxForLLVMBuild(host, 'lib', options) +
@@ skipping 24 matching lines @@
                   [
                    '--disable-bindings', # ocaml is currently the only binding.
                    '--disable-jit',
                    '--disable-terminfo',
                    '--disable-zlib',
                    '--enable-optimized=' + ('no' if HostIsDebug(options)
                                             else 'yes'),
                    '--enable-debug=' + ('yes' if HostIsDebug(options)
                                         else 'no'),
                    '--enable-targets=x86,arm,mips,js',
+                   '--enable-subzero-targets=X8632,ARM32',
                    '--enable-werror=' + ('yes' if llvm_do_werror else 'no'),
                    '--prefix=/',
                    '--program-prefix=',
                    '--with-binutils-include=%(abs_binutils_pnacl_src)s/include',
                    '--with-clang-srcdir=%(abs_clang_src)s',
                    'ac_cv_have_decl_strerror_s=no',
                   ] + shared)] +
               CopyHostLibcxxForLLVMBuild(
                   host,
                   os.path.join(('Debug+Asserts' if HostIsDebug(options)
@@ skipping 443 matching lines @@
           'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_runtime_canonical))
 
     if args.build_sbtc and not args.pnacl_in_pnacl:
       packages.update(pnacl_sandboxed_translator.SandboxedTranslators(
         SANDBOXED_TRANSLATOR_ARCHES))
 
   tb = toolchain_main.PackageBuilder(packages,
                                      upload_packages,
                                      leftover_args)
   tb.Main()