Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(442)

Unified Diff: third_party/mesa/mesa.gyp

Issue 416423005: Update a clang warning in mesa after r287092 that I missed earlier. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mesa/mesa.gyp
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index 9be0bace29a27410224d8994f52abe583f37b4ec..462a3acc43191232e4240506a8b01fdb485fd085 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -266,6 +266,16 @@
'msvs_disabled_warnings': [
4005, 4018, 4090, 4099, 4146, 4273, 4291, 4305, 4334, 4748, 4267,
],
+ 'variables': {
+ 'clang_warning_flags': [
+ '-Wno-tautological-constant-out-of-range-compare',
+ '-Wno-absolute-value', # Fires on st_atom_array.c, might be a bug
+ ],
+ 'clang_warning_flags_unset': [
+ # Don't warn about string->bool used in asserts.
+ '-Wstring-conversion',
+ ],
+ },
'sources': [
'<(generated_src_dir)/mesa/builtin_function.cpp',
'<(generated_src_dir)/mesa/glapi_mapi_tmp_shared.h',
@@ -637,25 +647,6 @@
'src/src/mesa/x86-64/x86-64.h',
],
'conditions': [
- ['clang == 1', {
- 'xcode_settings': {
- 'WARNING_CFLAGS': [
- '-Wno-tautological-constant-out-of-range-compare',
- '-Wno-absolute-value', # Fires on st_atom_array.c, might be a bug
- ],
- 'WARNING_CFLAGS!': [
- # Don't warn about string->bool used in asserts.
- '-Wstring-conversion',
- ],
- },
- 'cflags': [
- '-Wno-tautological-constant-out-of-range-compare',
- '-Wno-absolute-value',
- ],
- 'cflags!': [
- '-Wstring-conversion',
- ],
- }],
['OS=="android" and clang==0', {
# Disable sincos() optimization to avoid a linker error
# since Android's math library doesn't have sincos().
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698