Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / yasm / yasm.gyp

diff --git a/src/third_party/yasm/yasm.gyp b/src/third_party/yasm/yasm.gyp
index f135421..78f1966 100644 (file)
--- a/src/third_party/yasm/yasm.gyp
+++ b/src/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': [
         {
@@ -541,19 +534,10 @@
       'cflags': [
         '-std=gnu99',
       ],
-      'conditions': [
-        ['clang==1', {
-          'xcode_settings': {
-            'WARNING_CFLAGS': [
-              # re2c is missing CLOSEVOP from one switch.
-              '-Wno-switch',
-            ],
-          },
-          'cflags': [
-            '-Wno-switch',
-          ],
-        }],
-      ],
+      'variables': {
+          # re2c is missing CLOSEVOP from one switch.
+        'clang_warning_flags': [ '-Wno-switch' ],
+      },
       'msvs_disabled_warnings': [ 4267 ],
     },
     {