diff options
| author |  halcanary <halcanary@google.com> | 2016-05-23 14:02:54 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-23 14:02:54 -0700 |
| commit | 3d5942e8a4fe8845c49a7afaf8248c4e9b5b7520 (patch) | |
| tree | 2586e89a54c5b01da16495d6ac5c364e50ed5149 /gyp | |
| parent | c75d6a8e43891eb197c369b508862bf990957aee (diff) | |
gyp: clean up warnings with clang-3.8
Also: update zlib DEPS.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002233002
Review-Url: https://codereview.chromium.org/2002233002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/codec.gyp | 3 | ||||
| -rw-r--r-- | gyp/lua.gyp | 11 | ||||
| -rw-r--r-- | gyp/zlib.gyp | 10 |
3 files changed, 15 insertions, 9 deletions
diff --git a/gyp/codec.gyp b/gyp/codec.gyp index c7393bb7ca..e2269f2a93 100644 --- a/gyp/codec.gyp +++ b/gyp/codec.gyp @@ -24,7 +24,8 @@ ], 'cflags':[ # FIXME: This gets around a warning: "Argument might be clobbered by longjmp". - '-Wno-clobbered -Wno-error', + '-Wno-clobbered', + '-Wno-unknown-warning-option', ], 'include_dirs': [ '../include/codec', diff --git a/gyp/lua.gyp b/gyp/lua.gyp index e0ad23a022..56080e47fa 100644 --- a/gyp/lua.gyp +++ b/gyp/lua.gyp @@ -59,16 +59,15 @@ 'defines': [ "getlocaledecpoint()='.'", ], - 'cflags': [ - '-Wno-parentheses-equality', - '-Wno-pointer-bool-conversion', - ], - 'xcode_settings': { - 'WARNING_CFLAGS': [ + 'variables': { + 'skia_lua_flags' : [ '-Wno-parentheses-equality', '-Wno-pointer-bool-conversion', + '-Wno-array-bounds', ], }, + 'cflags': [ '<@(skia_lua_flags)' ], + 'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_lua_flags)' ], }, 'conditions': [ ['skia_os != "win"', { diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp index 43cf6abfd2..6263c6697b 100644 --- a/gyp/zlib.gyp +++ b/gyp/zlib.gyp @@ -19,8 +19,14 @@ }, }, { 'type': 'static_library', - 'cflags': [ '-Wno-unused-value' ], - 'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-unused-value', ], }, + 'variables': { + 'skia_zlib_flags' : [ + '-Wno-unused-value', + '-Wno-shift-negative-value', + ], + }, + 'cflags': [ '<@(skia_zlib_flags)' ], + 'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_zlib_flags)' ], }, 'sources': [ '../third_party/externals/zlib/adler32.c', '../third_party/externals/zlib/compress.c', |