Honor werror variable for untrusted builds.

build/untrusted.gypi

Index: build/untrusted.gypi
diff --git a/build/untrusted.gypi b/build/untrusted.gypi
index a3a17437f8e0c11c4128ce77509d46011cde5681..f85a08a9fb38fdc17535be7485226f61b8e5814e 100755
--- a/build/untrusted.gypi
+++ b/build/untrusted.gypi
@@ -343,7 +343,7 @@
                   '--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))',
@@ -383,7 +383,7 @@
                   '--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))',
@@ -651,6 +651,9 @@
     'gcc_compile_flags': [],
     'pnacl_compile_flags': [],
     'variables': {
+      # Enable -Werror by default, but put it in a variable so it can
+      # be disabled in ~/.gyp/include.gypi on the valgrind builders.

[Mark Seaborn, 2012/11/14 19:50:05]

Nit: 'valgrind' -> 'Valgrind'.  Why would -Werror need to be disabled on the
Valgrind builders?  This shouldn't really be done via ~/.gyp/include.gypi --
that's very hacky.

[Sam Clegg, 2012/11/15 00:19:16]

Fixed.

This was just a direct copy from chromium/src/build/common.gypi.

+      'werror%': '-Werror',
       'build_pnacl_newlib': 0,
       'nlib_target': '',
       'extra_deps_pnacl_newlib': [],
@@ -677,6 +680,9 @@
         '-Wno-unused-private-field',
       ],
     },
+    'compile_flags': [
+      '<(werror)',  # See note above about the werror variable.
+    ],
     'target_conditions': [
       ['nexe_target!="" and build_pnacl_newlib!=0', {
         'variables': {
@@ -718,7 +724,7 @@
               '--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))',
@@ -829,7 +835,7 @@
               '--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))',