diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 21:14:52 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 21:14:52 +0000 |
| commit | 218514fbdd7a4ee4720971866d83513a66cb5ddc (patch) | |
| tree | 5a037fc54c1f4879d21a9fe9a329bfd27acae57f /third_party | |
| parent | 1d342b8d2df3cc2995e1fd2ee763c26b8600ca33 (diff) | |
| download | chromium_src-218514fbdd7a4ee4720971866d83513a66cb5ddc.zip chromium_src-218514fbdd7a4ee4720971866d83513a66cb5ddc.tar.gz chromium_src-218514fbdd7a4ee4720971866d83513a66cb5ddc.tar.bz2 | |
Add missing .exe extension to yasm binary path on Windows
Avoids spurious rebuilds when building with ninja on Windows, as it's expecting "yasm" to exist, rather than "yasm.exe". In VS, the dependency check happens to work because there's a directory named "yasm" parallel to yasm.exe which it seems to accept.
Also fix minor typo in compile message.
Review URL: http://codereview.chromium.org/10206010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/yasm/yasm_compile.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/yasm/yasm_compile.gypi b/third_party/yasm/yasm_compile.gypi index 13597a6..52760cc 100644 --- a/third_party/yasm/yasm_compile.gypi +++ b/third_party/yasm/yasm_compile.gypi @@ -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. @@ -30,7 +30,7 @@ 'conditions': [ [ 'use_system_yasm==0', { - 'yasm_path': '<(PRODUCT_DIR)/yasm', + 'yasm_path': '<(PRODUCT_DIR)/yasm<(EXECUTABLE_SUFFIX)', }, { 'yasm_path': '<!(which yasm)', }], @@ -97,7 +97,7 @@ '<(RULE_INPUT_PATH)', ], 'process_outputs_as_sources': 1, - 'message': 'Compile assemly <(RULE_INPUT_PATH).', + 'message': 'Compile assembly <(RULE_INPUT_PATH).', }, ], # rules } |