| Index: third_party/yasm/yasm.gyp
|
| diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp
|
| index f135421bf170332da073509eb3a88031f81184ec..b691d8601778a7e6534c54f3b644822e7b1476c7 100644
|
| --- a/third_party/yasm/yasm.gyp
|
| +++ b/third_party/yasm/yasm.gyp
|
| @@ -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': [
|
| {
|
|
|