Honor werror variable for untrusted builds.

build/untrusted.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # See native_client/Sconstruct for more details.
     # Expected address for beginning of data in for the IRT.
     'NACL_IRT_DATA_START': '0x3ef00000',
     # Expected address for beginning of code in for the IRT.
     'NACL_IRT_TEXT_START': '0x0fc00000',
     # Default C compiler defines.
     'nacl_default_defines': [
       '__linux__',
       '__STDC_LIMIT_MACROS=1',
       '__STDC_FORMAT_MACROS=1',
       '_GNU_SOURCE=1',
       '_BSD_SOURCE=1',
       '_POSIX_C_SOURCE=199506',
       '_XOPEN_SOURCE=600',
       'DYNAMIC_ANNOTATIONS_ENABLED=1',
       'DYNAMIC_ANNOTATIONS_PREFIX=NACL_',
     ],
     'nacl_default_compile_flags': [
       #'-std=gnu99',  Added by build_nexe
       '-O2',
       '-g',
       '-Wall',
+      '-Werror',
       '-fdiagnostics-show-option',
     ],
   },
   'conditions': [
     ['target_arch!="arm"', {
       'target_defaults': {
         'conditions': [
           ['OS=="win"', {
             'variables': {
               # NOTE: Python is invoked differently by the Native Client
@@ skipping 297 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nexe',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
                   '--lib-dirs=>(lib_dirs_newlib_arm) ',
-                  '--compile_flags=--pnacl-frontend-triple=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(pnacl_compile_flags) >(_pnacl_compile_flags) ^(compile_flags) >(_compile_flags)',
+                  '--compile_flags=--pnacl-frontend-triple=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-arch arm --pnacl-allow-translate --pnacl-allow-native -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm ^(link_flags) >(_link_flags)',
                   '--source-list=^|(<(source_list_newlib_arm) ^(_sources) ^(sources))',
                  ],
               },
             ],
           }],
           ['nlib_target!="" and build_newlib!=0', {
             'variables': {
               'tool_name': 'newlib',
@@ skipping 19 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nlib',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
                   '--lib-dirs=>(lib_dirs_newlib_arm) ',
-                  '--compile_flags=--pnacl-frontend-triple=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(pnacl_compile_flags) >(_pnacl_compile_flags) ^(compile_flags) >(_compile_flags)',
+                  '--compile_flags=--pnacl-frontend-triple=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm ^(link_flags) >(_link_flags)',
                   '--source-list=^|(<(source_list_newlib_arm) ^(_sources) ^(sources))',
                 ],
               },
             ],
           }],
         ],
       },
     }],
@@ skipping 314 matching lines @@
               '<(DEPTH)/native_client/build/build_nexe.py',
               '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
               '>@(extra_args)',
               '--arch', 'pnacl',
               '--build', 'newlib_pexe',
               '--root', '<(DEPTH)',
               '--name', '>(out_pnacl_newlib)',
               '--objdir', '>(objdir_pnacl_newlib)',
               '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
               '--lib-dirs=>(lib_dirs_pnacl_newlib)',
-              '--compile_flags=^(pnacl_compile_flags) >(_pnacl_compile_flags) ^(compile_flags) >(_compile_flags)',
+              '--compile_flags=^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
               '--defines=^(defines) >(_defines)',
               '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib/lib ^(link_flags) >(_link_flags)',
               '--source-list=^|(<(source_list_pnacl_newlib) ^(_sources) ^(sources))',
             ],
           }],
           'target_conditions': [
             [ 'enable_x86_32!=0', {
               'actions': [{
                 'action_name': 'translate newlib pexe to x86-32 nexe',
                 'msvs_cygwin_shell': 0,
@@ skipping 90 matching lines @@
               '<(DEPTH)/native_client/build/build_nexe.py',
               '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
               '>@(extra_args)',
               '--arch', 'pnacl',
               '--build', 'newlib_plib',
               '--root', '<(DEPTH)',
               '--name', '>(out_pnacl_newlib)',
               '--objdir', '>(objdir_pnacl_newlib)',
               '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
               '--lib-dirs=>(lib_dirs_pnacl_newlib) ',
-              '--compile_flags=^(pnacl_compile_flags) >(_pnacl_compile_flags) ^(compile_flags) >(_compile_flags)',
+              '--compile_flags=^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
               '--defines=^(defines) >(_defines)',
               '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib/lib ^(link_flags) >(_link_flags)',
               '--source-list=^|(<(source_list_pnacl_newlib) ^(_sources) ^(sources))',
             ],
           },
         ],
       }],
     ],
   },
 }