diff options
author | vrk <vrk@chromium.org> | 2014-11-25 16:50:35 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-26 00:51:17 +0000 |
commit | 60f77f2b85674ec3f681cce82b28b83c3beff596 (patch) | |
tree | 8bb34bbe3738ccc0dbf3fa041ed77bc072156780 /build | |
parent | ab13bf93b61d1d45ad0d142b7bdf80ba172102af (diff) | |
download | chromium_src-60f77f2b85674ec3f681cce82b28b83c3beff596.zip chromium_src-60f77f2b85674ec3f681cce82b28b83c3beff596.tar.gz chromium_src-60f77f2b85674ec3f681cce82b28b83c3beff596.tar.bz2 |
Revert of clang: Suppress a -Wstring-conversion warnings in nspr. (patchset #1 id:1 of https://codereview.chromium.org/754623004/)
Reason for revert:
Build failed:
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/54166
"ERROR: Shared library dependencies changed!"
Unsure if this is the cause, but it looks like a clang roll a few weeks ago caused a similar error message (crbug.com/433065) so seeing if a revert fixes things :) sorry if this is the wrong CL!
Original issue's description:
> clang: Suppress a -Wstring-conversion warnings in nspr.
>
> Do the gn version directly, and roll the nss dep to pick up the gyp version.
>
> BUG=82385
> R=hans@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/109b55f5bed033a46f10fd2f50093b82f03586f3
TBR=hans@chromium.org,thakis@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=82385
Review URL: https://codereview.chromium.org/758303002
Cr-Commit-Position: refs/heads/master@{#305740}
Diffstat (limited to 'build')
-rw-r--r-- | build/secondary/third_party/nss/BUILD.gn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn index 16568c0..a285ca1 100644 --- a/build/secondary/third_party/nss/BUILD.gn +++ b/build/secondary/third_party/nss/BUILD.gn @@ -332,10 +332,10 @@ if (is_linux) { "-Wno-incompatible-pointer-types", # nspr passes "int*" through "unsigned int*". "-Wno-pointer-sign", - ] - # nspr uses assert(!"foo") instead of assert(false && "foo"). - configs -= [ "//build/config/clang:extra_warnings" ] + "-Wno-incompatible-pointer-types", + "-Wno-pointer-sign", + ] } } |