use EXECUTABLE_SUFFIX instead of exe_ext in yasm.gyp

third_party/yasm/yasm.gyp

Index: third_party/yasm/yasm.gyp
diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp
index 657ee48836e75b67ecbf8810e3a6620e4782eb61..7e7721de3099bbbb76ea5238f7b860e260f09956 100644
--- a/third_party/yasm/yasm.gyp
+++ b/third_party/yasm/yasm.gyp
@@ -55,14 +55,6 @@
     # Various files referenced by multiple targets.
     'version_file': 'version.mac',  # Generated by genversion.
     'genmodule_source': 'genmodule_outfile.c',
-
-    'conditions': [
-      ['OS=="win"', {
-        'exe_ext': '.exe',
-      },{
-        'exe_ext' : '',
-      }]
-    ],
   },
   'targets': [
     {
@@ -170,7 +162,8 @@
         {
           'rule_name': 'generate_gperf',
           'extension': 'gperf',
-          'inputs': [ '<(PRODUCT_DIR)/genperf<(exe_ext)' ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)genperf<(EXECUTABLE_SUFFIX)' ],

[Ryan Sleevi, 2012/01/12 00:50:19]

GYP doesn't support line continuations like this (it matches  JSON syntax more
than python dicts)

           'outputs': [
             '<(generated_dir)/<(RULE_INPUT_ROOT).c',
           ],
@@ -185,7 +178,8 @@
         {
           'rule_name': 'generate_re2c',
           'extension': 're',
-          'inputs': [ '<(PRODUCT_DIR)/re2c<(exe_ext)' ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)re2c<(EXECUTABLE_SUFFIX)' ],
           'outputs': [ '<(generated_dir)/<(RULE_INPUT_ROOT).c', ],
           'action': [
             '<(PRODUCT_DIR)/re2c',
@@ -209,7 +203,9 @@
             'varname': 'nasm_standard_mac',
             'outfile': '<(generated_dir)/nasm-macros.c',
           },
-          'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)genmacro<(EXECUTABLE_SUFFIX)',
+                      '<(infile)', ],
           'outputs': [ '<(outfile)', ],
           'action': ['<(PRODUCT_DIR)/genmacro',
                      '<(outfile)', '<(varname)', '<(infile)', ],
@@ -225,7 +221,9 @@
             'varname': 'nasm_version_mac',
             'outfile': '<(generated_dir)/nasm-version.c',
           },
-          'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)genmacro<(EXECUTABLE_SUFFIX)',
+                      '<(infile)', ],
           'outputs': [ '<(outfile)', ],
           'action': ['<(PRODUCT_DIR)/genmacro',
                      '<(outfile)', '<(varname)', '<(infile)',
@@ -242,7 +240,9 @@
             'varname': 'win64_gas_stdmac',
             'outfile': '<(generated_dir)/win64-gas.c',
           },
-          'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)genmacro<(EXECUTABLE_SUFFIX)',
+                      '<(infile)', ],
           'outputs': [ '<(outfile)', ],
           'action': ['<(PRODUCT_DIR)/genmacro',
                      '<(outfile)', '<(varname)', '<(infile)',
@@ -259,7 +259,9 @@
             'varname': 'win64_nasm_stdmac',
             'outfile': '<(generated_dir)/win64-nasm.c',
           },
-          'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)genmacro<(EXECUTABLE_SUFFIX)',
+                      '<(infile)', ],
           'outputs': [ '<(outfile)', ],
           'action': ['<(PRODUCT_DIR)/genmacro',
                      '<(outfile)',
@@ -282,7 +284,9 @@
             'varname': 'license_msg',
             'outfile': '<(generated_dir)/license.c',
           },
-          'inputs': [ '<(PRODUCT_DIR)/genstring<(exe_ext)', '<(infile)', ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)genstring<(EXECUTABLE_SUFFIX)',
+                      '<(infile)', ],
           'outputs': [ '<(outfile)', ],
           'action': ['<(PRODUCT_DIR)/genstring',
                      '<(varname)',
@@ -305,7 +309,9 @@
             # The license file is #included by yasm.c.
             'outfile': '<(generated_dir)/lc3bid.c',
           },
-          'inputs': [ '<(PRODUCT_DIR)/re2c<(exe_ext)', '<(infile)', ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)re2c<(EXECUTABLE_SUFFIX)',
+                      '<(infile)', ],
           'outputs': [ '<(outfile)', ],
           'action': [
             '<(PRODUCT_DIR)/re2c',
@@ -328,7 +334,7 @@
             'outfile': '<(generated_dir)/module.c',
           },
           'inputs': [
-            '<(PRODUCT_DIR)/genmodule<(exe_ext)',
+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)genmodule<(EXECUTABLE_SUFFIX)',
             '<(module_in)',
             '<(makefile)'
           ],
@@ -370,7 +376,8 @@
         {
           'rule_name': 'generate_gperf',
           'extension': 'gperf',
-          'inputs': [ '<(PRODUCT_DIR)/genperf<(exe_ext)' ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)genperf<(EXECUTABLE_SUFFIX)' ],
           'outputs': [ '<(shared_generated_dir)/<(RULE_INPUT_ROOT).c', ],
           'action': [
             '<(PRODUCT_DIR)/genperf',
@@ -404,7 +411,8 @@
         },
         {
           'action_name': 'generate_version',
-          'inputs': [ '<(PRODUCT_DIR)/genversion<(exe_ext)' ],
+          'inputs': [ '<(PRODUCT_DIR)/' +
+                      '<(EXECUTABLE_PREFIX)genversion<(EXECUTABLE_SUFFIX)' ],
           'outputs': [ '<(shared_generated_dir)/<(version_file)', ],
           'action': [
             '<(PRODUCT_DIR)/genversion',