diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 20:37:36 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 20:37:36 +0000 |
| commit | 371e1091ebd6af7f6e110a84fd105f6c81a1fb88 (patch) | |
| tree | af3156c793e9352b978233c6757b2393a5de94f9 /third_party/yasm | |
| parent | a6ffd7d8c87672af4970e52d29d0b15479f11cad (diff) | |
| download | chromium_src-371e1091ebd6af7f6e110a84fd105f6c81a1fb88.zip chromium_src-371e1091ebd6af7f6e110a84fd105f6c81a1fb88.tar.gz chromium_src-371e1091ebd6af7f6e110a84fd105f6c81a1fb88.tar.bz2 | |
Fix build with system yasm.
BUG=100078
Review URL: http://codereview.chromium.org/8243012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm')
| -rw-r--r-- | third_party/yasm/yasm_compile.gypi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/third_party/yasm/yasm_compile.gypi b/third_party/yasm/yasm_compile.gypi index f9175e7..8bae3a6 100644 --- a/third_party/yasm/yasm_compile.gypi +++ b/third_party/yasm/yasm_compile.gypi @@ -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', ], |