0

Update several clang warnings after r287092.

I missed a few targets that I though were deps'd in, but which (thankfully)
just live in the regular tree.

BUG=none
R=hans@chromium.org
TBR=cpu

Review URL: https://codereview.chromium.org/429793006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287137 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
thakis@chromium.org
2014-08-02 00:46:00 +00:00
parent 04671d7392
commit 4b8927edff
4 changed files with 24 additions and 53 deletions
third_party

@ -145,17 +145,10 @@
'dependencies': [
'../../third_party/icu/icu.gyp:icuuc',
],
'variables': {
'clang_warning_flags': [ '-Wno-unused-value', ],
},
'conditions': [
['clang==1', {
'xcode_settings': {
'WARNING_CFLAGS': [
'-Wno-unused-value',
],
},
'cflags': [
'-Wno-unused-value',
]
}],
['OS=="win"', {
# TODO(eae): C4267 on amd64. size_t -> int, size_t -> unsigned int
'msvs_disabled_warnings': [4267, 4334],

@ -148,6 +148,12 @@
}
},
},
'variables': {
'clang_warning_flags_unset': [
# Don't warn about string->bool used in asserts.
'-Wstring-conversion',
],
},
'conditions': [
['"<(libpeer_target_type)"=="static_library"', {
'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
@ -193,17 +199,6 @@
}],
],
}],
['clang == 1', {
'xcode_settings': {
'WARNING_CFLAGS!': [
# Don't warn about string->bool used in asserts.
'-Wstring-conversion',
],
},
'cflags!': [
'-Wstring-conversion',
],
}],
['OS=="linux"', {
'defines': [
'LINUX',

@ -101,6 +101,15 @@
'mesa_headers',
'mesa_libglslcommon', # implicit dependency on generate_main_mesa_sources
],
'variables': {
'clang_warning_flags': [
'-Wno-tautological-constant-out-of-range-compare',
],
'clang_warning_flags_unset': [
# Don't warn about string->bool used in asserts.
'-Wstring-conversion',
],
},
'sources': [
'src/src/mesa/program/hash_table.c',
'src/src/mesa/program/symbol_table.c',
@ -108,25 +117,6 @@
'src/src/glsl/main.cpp',
'src/src/glsl/builtin_stubs.cpp',
],
'conditions': [
['clang == 1', {
'xcode_settings': {
'WARNING_CFLAGS': [
'-Wno-tautological-constant-out-of-range-compare',
],
'WARNING_CFLAGS!': [
# Don't warn about string->bool used in asserts.
'-Wstring-conversion',
],
},
'cflags': [
'-Wtautological-constant-out-of-range-compare',
],
'cflags!': [
'-Wstring-conversion',
],
}],
],
},
{
'target_name': 'generate_mesa_sources',

@ -71,6 +71,12 @@
'genstring',
're2c',
],
'variables': {
'clang_warning_flags': [
# yasm passes a `const elf_machine_sym*` through `void*`.
'-Wno-incompatible-pointer-types',
],
},
'sources': [
'source/patched-yasm/frontends/yasm/yasm-options.c',
'source/patched-yasm/frontends/yasm/yasm.c',
@ -158,19 +164,6 @@
],
'defines': [ '<@(yasm_defines)' ],
'cflags': [ '<@(yasm_cflags)', ],
'conditions': [
['clang==1', {
'xcode_settings': {
'WARNING_CFLAGS': [
# yasm passes a `const elf_machine_sym*` through `void*`.
'-Wno-incompatible-pointer-types',
],
},
'cflags': [
'-Wno-incompatible-pointer-types',
],
}],
],
'msvs_disabled_warnings': [ 4267 ],
'rules': [
{