Index: third_party/mesa/mesa.gyp |
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp |
index 5ad3fa18f7ee9c5737c5e30f5408be68effbf5e1..9be0bace29a27410224d8994f52abe583f37b4ec 100644 |
--- a/third_party/mesa/mesa.gyp |
+++ b/third_party/mesa/mesa.gyp |
@@ -129,6 +129,15 @@ |
'msvs_disabled_warnings': [ |
4005, 4018, 4065, 4090, 4099, 4273, 4291, 4345, 4267, |
], |
+ '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': [ |
'<(generated_src_dir)/mesa/main/dispatch.h', |
'src/src/glsl/ast_expr.cpp', |
@@ -230,25 +239,6 @@ |
'src/src/glsl/strtod.c', |
'src/src/glsl/strtod.h', |
], |
- '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': [ |
- '-Wno-tautological-constant-out-of-range-compare', |
- ], |
- 'cflags!': [ |
- '-Wstring-conversion', |
- ], |
- }], |
- ], |
}, |
{ |
'target_name': 'mesa', |