diff options
| author | sigbjornf <sigbjornf@opera.com> | 2015-03-22 04:24:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-22 11:25:15 +0000 |
| commit | 7e9611ced1805c43af09fccc03367313e5253ca9 (patch) | |
| tree | 860a551ccd40067471f7df44a5e25d374db85f14 /build/linux/system.gyp | |
| parent | 86ebf48be903b226d068b08efa16fe3725babb8c (diff) | |
| download | chromium_src-7e9611ced1805c43af09fccc03367313e5253ca9.zip chromium_src-7e9611ced1805c43af09fccc03367313e5253ca9.tar.gz chromium_src-7e9611ced1805c43af09fccc03367313e5253ca9.tar.bz2 | |
Revert "remove -Wno-header-guard workaround for old versions of NSS"
This reverts commit 86ebf48be903b226d068b08efa16fe3725babb8c.
Build failures:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder/builds/20027
http://build.chromium.org/p/chromium.webkit/builders/GPU%20Linux%20Builder%20%28dbg%29/builds/31334
Original issue's description:
> remove -Wno-header-guard workaround for old versions of NSS
>
> I think it's safe to re-enable this warning now. The bug was
> fixed upstream in 3.15.1 and there have been several NSS upgrades since then.
>
> BUG=255201
> Committed: https://crrev.com/86ebf48be903b226d068b08efa16fe3725babb8c
> Cr-Commit-Position: refs/heads/master@{#321711}
TBR=mostynb@opera.com,thakis@chromium.org
BUG=255201
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1024343002
Cr-Commit-Position: refs/heads/master@{#321712}
Diffstat (limited to 'build/linux/system.gyp')
| -rw-r--r-- | build/linux/system.gyp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index ffb3d98..5333798 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -1204,6 +1204,15 @@ ], }, }], + ['use_openssl==0 and clang==1', { + 'direct_dependent_settings': { + 'cflags': [ + # There is a broken header guard in /usr/include/nss/secmod.h: + # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 + '-Wno-header-guard', + ], + }, + }], ] }], ], |