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..158d28367c1a03225c7cd3a09993037c04c81b28 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))',
@@ -675,6 +675,14 @@
       'pnacl_compile_flags': [
         '-Wno-extra-semi',
         '-Wno-unused-private-field',
+        # Copyied from common.gypi.  These flags are needed to compile

[Mark Seaborn, 2012/11/10 02:24:19]

'Copied'

+        # warning-free with clang.
+        # TODO(sbc): remove these once they are no longer needed in
+        # common.gypi.
+        '-Wno-unused-function',
+        '-Wno-char-subscripts',
+        '-Wno-c++11-extensions',
+        '-Wno-unnamed-type-template-args',
       ],
     },
     'target_conditions': [
@@ -718,7 +726,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 +837,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))',