diff options
| author | dpranke <dpranke@chromium.org> | 2014-11-17 17:54:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-18 01:55:10 +0000 |
| commit | de7d0dc942b1e296a0e9bd667f020ffd486cc32e (patch) | |
| tree | 20701d9c168101ade29a02cd51710347c3dc3aaa /third_party/zlib | |
| parent | 41b0acac5f6ae101df41208dd721b0a7a647c17d (diff) | |
| download | chromium_src-de7d0dc942b1e296a0e9bd667f020ffd486cc32e.zip chromium_src-de7d0dc942b1e296a0e9bd667f020ffd486cc32e.tar.gz chromium_src-de7d0dc942b1e296a0e9bd667f020ffd486cc32e.tar.bz2 | |
Fix various flags in the Win64 GN build
-disable chromium_code for third_party/zlib
- suppress a few size_t -> int conversion warnings
- suppress /wd4121 (structure padding) by default;
was suppressed in GYP but not GN.
Also disable ffmpeg, which doesn't work in the 64-bit build yet.
R=scottmg@chromium.org
TBR=brettw@chromium.org
BUG=432375, 167187
Review URL: https://codereview.chromium.org/737633002
Cr-Commit-Position: refs/heads/master@{#304542}
Diffstat (limited to 'third_party/zlib')
| -rw-r--r-- | third_party/zlib/BUILD.gn | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn index 5dbec0f..d07fd9a 100644 --- a/third_party/zlib/BUILD.gn +++ b/third_party/zlib/BUILD.gn @@ -12,11 +12,10 @@ static_library("zlib_x86_simd") { cflags = [ "-msse2", "-msse4.2", "-mpclmul" ] } else { sources = [ "simd_stub.c"] - if (is_win) { - # TODO(GYP): crbug.com/431462 disable warning about structure padding. - cflags = [ "/wd4324" ] - } } + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] } static_library("zlib") { |