Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: third_party/yasm/yasm_compile.gypi

Issue 8243012: Fix build with system yasm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/yasm/yasm_compile.gypi
===================================================================
--- third_party/yasm/yasm_compile.gypi (revision 105085)
+++ third_party/yasm/yasm_compile.gypi (working copy)
@@ -27,9 +27,14 @@
{
'variables': {
'yasm_flags': [],
- 'yasm_path': '<(PRODUCT_DIR)/yasm',
'conditions': [
+ [ 'use_system_yasm==0', {
+ 'yasm_path': '<(PRODUCT_DIR)/yasm',
+ }, {
+ 'yasm_path': '<!(which yasm)',
+ }],
+
# Define yasm_flags that pass into YASM.
[ 'OS=="linux" and target_arch=="ia32"', {
'yasm_flags': [
@@ -70,7 +75,7 @@
'conditions': [
# Only depend on YASM on x86 systems, do this so that compiling
# .asm files for ARM will fail.
- ['target_arch=="ia32" or target_arch=="x64"', {
+ ['use_system_yasm==0 and ( target_arch=="ia32" or target_arch=="x64" )', {
'dependencies': [
'<(DEPTH)/third_party/yasm/yasm.gyp:yasm#host',
],
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698