Enable -Werror for LLVM build

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 475 matching lines @@
   def H(component_name):
     # Return a package name for a component name with a host triple.
     return GSDJoin(component_name, host)
   # Return the file name with the appropriate suffix for an executable file.
   def Exe(file):
     if TripleIsWindows(host):
       return file + '.exe'
     else:
       return file
 
-  werror = []
+  # TODO(jfb): gold's build currently generates the following error on Windows:
+  #            too many arguments for format.
+  binutils_do_werror = not TripleIsWindows(host)
   extra_gold_deps = []
   if host == 'le32-nacl':
     # TODO(bradnelson): Fix warnings so this can go away.
-    werror = ['--enable-werror=no']
+    binutils_do_werror = False
     extra_gold_deps = [H('llvm')]
 
   # Binutils still has some warnings when building with clang
   if not options.gcc:
     warning_flags = ['-Wno-extended-offsetof', '-Wno-absolute-value',
                     '-Wno-unused-function', '-Wno-unused-const-variable',
                     '-Wno-unneeded-internal-declaration',
                     '-Wno-unused-private-field', '-Wno-format-security']
   else:
     warning_flags = ['-Wno-unused-function', '-Wno-unused-value']
 
   tools = {
       # The binutils_pnacl package is used both for bitcode linking (gold) and
       # for its conventional use with arm-nacl-clang.
       H('binutils_pnacl'): {
           'dependencies': ['binutils_pnacl_src'] + extra_gold_deps,
           'type': 'build',
           'inputs' : { 'macros': os.path.join(NACL_DIR,
               'pnacl', 'support', 'clang_direct', 'nacl-arm-macros.s')},
           'commands': [
               command.SkipForIncrementalCommand([
                   'sh',
                   '%(binutils_pnacl_src)s/configure'] +
                   ConfigureBinutilsCommon() +
                   ConfigureHostArchFlags(
                     host, warning_flags, options,
                     options.binutils_pnacl_extra_configure) +
-                  ['--target=arm-nacl',
-                  '--program-prefix=le32-nacl-',
-                  '--enable-targets=arm-nacl,i686-nacl,x86_64-nacl,' +
-                  'mipsel-nacl',
-                  '--enable-shared=no',
+                  [
                   '--enable-gold=default',
                   '--enable-plugins',
-                  '--without-gas',
-                  '--with-sysroot=/le32-nacl'] + werror),
+                  '--enable-shared=no',
+                  '--enable-targets=arm-nacl,i686-nacl,x86_64-nacl,mipsel-nacl',
+                  '--enable-werror=' + ('yes' if binutils_do_werror else 'no'),
+                  '--program-prefix=le32-nacl-',
+                  '--target=arm-nacl',
+                  '--with-sysroot=/le32-nacl',
+                  '--without-gas'
+                  ]),
               command.Command(MakeCommand(host)),
               command.Command(MAKE_DESTDIR_CMD + ['install-strip'])] +
               [command.RemoveDirectory(os.path.join('%(output)s', dir))
                for dir in ('lib', 'lib32')] +
               # Since it has dual use, just create links for both sets of names
               # (i.e. le32-nacl-foo and arm-nacl-foo)
               # TODO(dschuff): Use the redirector scripts here like binutils_x86
               [command.Command([
                   'ln', '-f',
                   command.path.join('%(output)s', 'bin', 'le32-nacl-' + tool),
@@ skipping 20 matching lines @@
             command.Runnable(
                 None,
                 pnacl_commands.InstallDriverScripts,
                 '%(src)s', '%(output)s',
                 host_windows=TripleIsWindows(host) or TripleIsCygWin(host),
                 host_64bit=TripleIsX8664(host))
         ],
       },
   }
 
+  # TODO(jfb) Windows currently uses MinGW's GCC 4.8.1 which generates warnings
+  #           on upstream LLVM code. Turn on -Werror once these are fixed.
+  llvm_do_werror = not TripleIsWindows(host)
+
   llvm_cmake = {
       H('llvm'): {
           'dependencies': ['clang_src', 'llvm_src', 'binutils_pnacl_src'],
           'type': 'build',
           'commands': [
               command.SkipForIncrementalCommand([
                   'cmake', '-G', 'Ninja'] +
                   CmakeHostArchFlags(host, options) +
-                  ['-DCMAKE_BUILD_TYPE=RelWithDebInfo',
+                  [
+                  '-DBUILD_SHARED_LIBS=ON',
+                  '-DCMAKE_BUILD_TYPE=RelWithDebInfo',
                   '-DCMAKE_INSTALL_PREFIX=%(output)s',
                   '-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib',
-                  '-DLLVM_ENABLE_LIBCXX=OFF',
-                  '-DBUILD_SHARED_LIBS=ON',
-                  '-DLLVM_TARGETS_TO_BUILD=X86;ARM;Mips',
-                  '-DLLVM_ENABLE_ASSERTIONS=ON',
-                  '-DLLVM_ENABLE_ZLIB=OFF',
-                  '-DLLVM_BUILD_TESTS=ON',
                   '-DLLVM_APPEND_VC_REV=ON',
                   '-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_TARGETS_TO_BUILD=X86;ARM;Mips',
                   '%(llvm_src)s']),
               command.Command(['ninja', '-v']),
               command.Command(['ninja', 'install']),
               ] +
           CreateSymLinksToDirectToNaClTools(host)
       },
   }
   cleanup_static_libs = []
   shared = []
   if host != 'le32-nacl':
     shared = ['--enable-shared']
     cleanup_static_libs = [
         command.Remove(*[os.path.join('%(output)s', 'lib', f) for f
                          in '*.a', '*Hello.*', 'BugpointPasses.*']),
     ]
   llvm_autoconf = {
       H('llvm'): {
           'dependencies': ['clang_src', 'llvm_src', 'binutils_pnacl_src',
                            'subzero_src'],
           'type': 'build',
           'commands': [
               command.SkipForIncrementalCommand([
                   'sh',
                   '%(llvm_src)s/configure'] +
                   ConfigureHostArchFlags(host, [], options) +
                   LLVMConfigureAssertionsFlags(options) +
-                  ['--prefix=/',
+                  [
+                   '--disable-bindings', # ocaml is currently the only binding.
+                   '--disable-jit',
+                   '--disable-terminfo',
                    '--disable-zlib',
-                   '--disable-terminfo',
-                   '--disable-jit',
-                   '--disable-bindings', # ocaml is currently the only binding.
+                   '--enable-optimized',
+                   '--enable-targets=x86,arm,mips',
+                   '--enable-werror=' + ('yes' if llvm_do_werror else 'no'),
+                   '--prefix=/',
+                   '--program-prefix=',
                    '--with-binutils-include=%(abs_binutils_pnacl_src)s/include',
-                   '--enable-targets=x86,arm,mips',
-                   '--program-prefix=',
-                   '--enable-optimized',
-                   '--with-clang-srcdir=%(abs_clang_src)s'] + shared)] +
+                   '--with-clang-srcdir=%(abs_clang_src)s'
+                  ] + shared)] +
               CopyHostLibcxxForLLVMBuild(
                   host,
                   os.path.join('Release+Asserts', 'lib'),
                   options) +
               [command.Command(MakeCommand(host) + [
                   'VERBOSE=1',
                   'NACL_SANDBOX=0',
                   'PNACL_BROWSER_TRANSLATOR=0',
                   'SUBZERO_SRC_ROOT=%(abs_subzero_src)s',
                   'all']),
@@ skipping 431 matching lines @@
           'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_irt_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()