Commit 218514fb authored by scottmg@chromium.org's avatar scottmg@chromium.org

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
parent 1d342b8d
# 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 # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
'conditions': [ 'conditions': [
[ 'use_system_yasm==0', { [ 'use_system_yasm==0', {
'yasm_path': '<(PRODUCT_DIR)/yasm', 'yasm_path': '<(PRODUCT_DIR)/yasm<(EXECUTABLE_SUFFIX)',
}, { }, {
'yasm_path': '<!(which yasm)', 'yasm_path': '<!(which yasm)',
}], }],
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
'<(RULE_INPUT_PATH)', '<(RULE_INPUT_PATH)',
], ],
'process_outputs_as_sources': 1, 'process_outputs_as_sources': 1,
'message': 'Compile assemly <(RULE_INPUT_PATH).', 'message': 'Compile assembly <(RULE_INPUT_PATH).',
}, },
], # rules ], # rules
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment