diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 19:01:27 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 19:01:27 +0000 |
| commit | fe5679da1b8061ba2d20e068c12b8a43036e28ea (patch) | |
| tree | 9e676fcee6c1e4dd687d30e3471e4fc28d9b1e33 /third_party/yasm | |
| parent | 1c6143a6d56e62ee06dd48b7a30bc410c4172f2e (diff) | |
| download | chromium_src-fe5679da1b8061ba2d20e068c12b8a43036e28ea.zip chromium_src-fe5679da1b8061ba2d20e068c12b8a43036e28ea.tar.gz chromium_src-fe5679da1b8061ba2d20e068c12b8a43036e28ea.tar.bz2 | |
Add .exe extension in gyp to fix yasm build deps. Fixes yasm always rebuilding on VS2010.
BUG=95406
Review URL: http://codereview.chromium.org/9181008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm')
| -rw-r--r-- | third_party/yasm/yasm.gyp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp index 533c1f0..657ee48 100644 --- a/third_party/yasm/yasm.gyp +++ b/third_party/yasm/yasm.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -55,6 +55,14 @@ # 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': [ { @@ -162,7 +170,7 @@ { 'rule_name': 'generate_gperf', 'extension': 'gperf', - 'inputs': [ '<(PRODUCT_DIR)/genperf' ], + 'inputs': [ '<(PRODUCT_DIR)/genperf<(exe_ext)' ], 'outputs': [ '<(generated_dir)/<(RULE_INPUT_ROOT).c', ], @@ -177,7 +185,7 @@ { 'rule_name': 'generate_re2c', 'extension': 're', - 'inputs': [ '<(PRODUCT_DIR)/re2c' ], + 'inputs': [ '<(PRODUCT_DIR)/re2c<(exe_ext)' ], 'outputs': [ '<(generated_dir)/<(RULE_INPUT_ROOT).c', ], 'action': [ '<(PRODUCT_DIR)/re2c', @@ -201,7 +209,7 @@ 'varname': 'nasm_standard_mac', 'outfile': '<(generated_dir)/nasm-macros.c', }, - 'inputs': [ '<(PRODUCT_DIR)/genmacro', '<(infile)', ], + 'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ], 'outputs': [ '<(outfile)', ], 'action': ['<(PRODUCT_DIR)/genmacro', '<(outfile)', '<(varname)', '<(infile)', ], @@ -217,7 +225,7 @@ 'varname': 'nasm_version_mac', 'outfile': '<(generated_dir)/nasm-version.c', }, - 'inputs': [ '<(PRODUCT_DIR)/genmacro', '<(infile)', ], + 'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ], 'outputs': [ '<(outfile)', ], 'action': ['<(PRODUCT_DIR)/genmacro', '<(outfile)', '<(varname)', '<(infile)', @@ -234,7 +242,7 @@ 'varname': 'win64_gas_stdmac', 'outfile': '<(generated_dir)/win64-gas.c', }, - 'inputs': [ '<(PRODUCT_DIR)/genmacro', '<(infile)', ], + 'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ], 'outputs': [ '<(outfile)', ], 'action': ['<(PRODUCT_DIR)/genmacro', '<(outfile)', '<(varname)', '<(infile)', @@ -251,7 +259,7 @@ 'varname': 'win64_nasm_stdmac', 'outfile': '<(generated_dir)/win64-nasm.c', }, - 'inputs': [ '<(PRODUCT_DIR)/genmacro', '<(infile)', ], + 'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ], 'outputs': [ '<(outfile)', ], 'action': ['<(PRODUCT_DIR)/genmacro', '<(outfile)', @@ -274,7 +282,7 @@ 'varname': 'license_msg', 'outfile': '<(generated_dir)/license.c', }, - 'inputs': [ '<(PRODUCT_DIR)/genstring', '<(infile)', ], + 'inputs': [ '<(PRODUCT_DIR)/genstring<(exe_ext)', '<(infile)', ], 'outputs': [ '<(outfile)', ], 'action': ['<(PRODUCT_DIR)/genstring', '<(varname)', @@ -297,7 +305,7 @@ # The license file is #included by yasm.c. 'outfile': '<(generated_dir)/lc3bid.c', }, - 'inputs': [ '<(PRODUCT_DIR)/re2c', '<(infile)', ], + 'inputs': [ '<(PRODUCT_DIR)/re2c<(exe_ext)', '<(infile)', ], 'outputs': [ '<(outfile)', ], 'action': [ '<(PRODUCT_DIR)/re2c', @@ -320,7 +328,7 @@ 'outfile': '<(generated_dir)/module.c', }, 'inputs': [ - '<(PRODUCT_DIR)/genmodule', + '<(PRODUCT_DIR)/genmodule<(exe_ext)', '<(module_in)', '<(makefile)' ], @@ -362,7 +370,7 @@ { 'rule_name': 'generate_gperf', 'extension': 'gperf', - 'inputs': [ '<(PRODUCT_DIR)/genperf' ], + 'inputs': [ '<(PRODUCT_DIR)/genperf<(exe_ext)' ], 'outputs': [ '<(shared_generated_dir)/<(RULE_INPUT_ROOT).c', ], 'action': [ '<(PRODUCT_DIR)/genperf', @@ -396,7 +404,7 @@ }, { 'action_name': 'generate_version', - 'inputs': [ '<(PRODUCT_DIR)/genversion' ], + 'inputs': [ '<(PRODUCT_DIR)/genversion<(exe_ext)' ], 'outputs': [ '<(shared_generated_dir)/<(version_file)', ], 'action': [ '<(PRODUCT_DIR)/genversion', |