Index: third_party/mesa/mesa_gensrc.gypi |
diff --git a/third_party/mesa/mesa_gensrc.gypi b/third_party/mesa/mesa_gensrc.gypi |
index b5e6529771e9c212c63449dfc1a96fd69e1c38a1..8b4b225a4c7ce4194dd3289d3e1c0d2090cf559d 100644 |
--- a/third_party/mesa/mesa_gensrc.gypi |
+++ b/third_party/mesa/mesa_gensrc.gypi |
@@ -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', |