linux/clang: Disable the last two warnings, turn on -Werror

BUG=138571 TBR=tony Review URL: https://chromiumcodereview.appspot.com/10855238 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152242 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Aug 18, 2012 · 82dd5eb · 82dd5eb
1 parent a5b3e3a
commit 82dd5eb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
@@ -613,6 +613,14 @@
             '..',
             '.',
           ],
+          'conditions': [
+            [ 'clang == 1', {
+              'cflags': [
+                # See http://crbug.com/138571#c18
+                '-Wno-unused-value',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'linux_dumper_unittest_helper',

diff --git a/build/common.gypi b/build/common.gypi
@@ -1618,7 +1618,6 @@
             'cflags!': [
               '-Wall',
               '-Wextra',
-              '-Werror',
             ],
             'cflags_cc': [
               # Don't warn about hash_map in third-party code.
@@ -1635,6 +1634,12 @@
               '-Wsign-compare',
             ]
           }],
+          # TODO: Fix all warnings on chromeos too.
+          [ 'os_posix==1 and OS!="mac" and OS!="ios" and (clang!=1 or chromeos==1)', {
+            'cflags!': [
+              '-Werror',
+            ],
+          }],
           [ 'os_posix==1 and os_bsd!=1 and OS!="mac" and OS!="android"', {
             'cflags': [
               # Don't warn about ignoring the return value from e.g. close().

diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp
@@ -89,6 +89,13 @@
       ],
       'msvs_disabled_warnings': [4018, 4244],
       'conditions': [
+        [ 'clang == 1', {
+          'cflags': [
+            # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the
+            # system's cert.h because cert.h isn't in chromium's repo.
+            '-Wno-incompatible-pointer-types',
+          ],
+        }],
         [ 'OS == "mac" or OS == "ios"', {
           'defines': [
             'XP_UNIX',