diff options
| author | engedy <engedy@chromium.org> | 2014-10-02 04:55:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-02 11:55:45 +0000 |
| commit | 0b29bcaaf9afc46785a7b757fd4292fa07dfcef0 (patch) | |
| tree | f35744c511f6836567fe638ad2b2bc9732bd7121 /net | |
| parent | 81d7c55c47677582259ab1b62b92d0d7c2557d47 (diff) | |
| download | chromium_src-0b29bcaaf9afc46785a7b757fd4292fa07dfcef0.zip chromium_src-0b29bcaaf9afc46785a7b757fd4292fa07dfcef0.tar.gz chromium_src-0b29bcaaf9afc46785a7b757fd4292fa07dfcef0.tar.bz2 | |
GN, GYP: Remove -Wno-incompatible-pointer-types flag for building NSS.
This workaround is no longer needed as the NSS bug was fixed in NSS 3.12.10 (see: https://bugzilla.mozilla.org/show_bug.cgi?id=635778), and Chromium requires NSS 3.14.3 or later now.
BUG=138571
Review URL: https://codereview.chromium.org/616093002
Cr-Commit-Position: refs/heads/master@{#297809}
Diffstat (limited to 'net')
| -rw-r--r-- | net/third_party/nss/ssl.gyp | 4 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/BUILD.gn | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp index f0c47d6..d6e2253 100644 --- a/net/third_party/nss/ssl.gyp +++ b/net/third_party/nss/ssl.gyp @@ -99,10 +99,6 @@ }], [ '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', - # There is a broken header guard in /usr/include/nss/secmod.h: # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 '-Wno-header-guard', diff --git a/net/third_party/nss/ssl/BUILD.gn b/net/third_party/nss/ssl/BUILD.gn index 7c4590f..b8fe40f 100644 --- a/net/third_party/nss/ssl/BUILD.gn +++ b/net/third_party/nss/ssl/BUILD.gn @@ -130,14 +130,6 @@ component("libssl") { ] } - if (is_clang) { - 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", - ] - } - if (is_debug) { defines += [ "DEBUG" ] } |