diff options
| author | aarya@google.com <aarya@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 15:14:15 +0000 |
|---|---|---|
| committer | aarya@google.com <aarya@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 15:14:15 +0000 |
| commit | 5a9e37c5cd756151a2e54604deb280e09e6004e2 (patch) | |
| tree | 7cdb589047c644678185e2ec6fba70e5e1529512 /chrome/chrome_exe.gypi | |
| parent | 9a2ab282d1c47034481da937dd6f2b86cfea3fcf (diff) | |
| download | chromium_src-5a9e37c5cd756151a2e54604deb280e09e6004e2.zip chromium_src-5a9e37c5cd756151a2e54604deb280e09e6004e2.tar.gz chromium_src-5a9e37c5cd756151a2e54604deb280e09e6004e2.tar.bz2 | |
Fix ASAN Compile, breakage in r99622 due to building nacl_helper even when disable_nacl=1
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 8207d80..f098d9c 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -455,8 +455,8 @@ }], ['OS=="linux"', { 'conditions': [ - # For now, do not build nacl_helper on ARM - ['target_arch!="arm"', { + # For now, do not build nacl_helper on ARM or when disable_nacl=1. + ['disable_nacl!=1 and target_arch!="arm"', { 'dependencies': [ 'nacl_helper_bootstrap', 'nacl_helper', |