diff options
| author | mcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 23:05:30 +0000 |
|---|---|---|
| committer | mcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 23:05:30 +0000 |
| commit | 938f4ea71a0e2806f4c50b4c6d59c1586f8aa399 (patch) | |
| tree | 3e998b06641a74dd7652b422d8ee0b812c755be8 /chrome/chrome.gyp | |
| parent | cf469aeabb7aceef1903e70e2380ebbcba90c2b9 (diff) | |
| download | chromium_src-938f4ea71a0e2806f4c50b4c6d59c1586f8aa399.zip chromium_src-938f4ea71a0e2806f4c50b4c6d59c1586f8aa399.tar.gz chromium_src-938f4ea71a0e2806f4c50b4c6d59c1586f8aa399.tar.bz2 | |
Add NACL_{BUILD,TARGET}_ARCH to nacl_defines; cover ARM case too
chrome/renderer/nacl_desc_wrapper_chrome.cc (indirectly via
native_client/src/include/nacl_base.h) depends on NACL_BUILD_ARCH being
defined. Before http://codereview.chromium.org/8973002 (native_client
r7458) the code failed to notice the missing definition and defaulted
to x86 by happenstance. Now the (Linux) compile fails unless all the
right macros are defined.
Define them for the chrome compilation so we won't have this problem next
time nacl_revision gets updated. It also makes the affected native_client
code actually use the right code in a non-x86 (i.e. ARM) build.
BUG= none
TEST= fixes Linux build of chrome with native_client tip of tree
R=mseaborn@chromium.org
Review URL: http://codereview.chromium.org/8964022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 3067ff7..69ea174 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -96,18 +96,30 @@ }], # branding ], # conditions }], # OS=="mac" + # TODO(mcgrathr): This duplicates native_client/build/common.gypi; + # we should figure out a way to unify the settings. ['target_arch=="ia32"', { 'nacl_defines': [ - # TODO(gregoryd): consider getting this from NaCl's common.gypi 'NACL_TARGET_SUBARCH=32', + 'NACL_TARGET_ARCH=x86', 'NACL_BUILD_SUBARCH=32', + 'NACL_BUILD_ARCH=x86', ], }], ['target_arch=="x64"', { 'nacl_defines': [ - # TODO(gregoryd): consider getting this from NaCl's common.gypi 'NACL_TARGET_SUBARCH=64', + 'NACL_TARGET_ARCH=x86', 'NACL_BUILD_SUBARCH=64', + 'NACL_BUILD_ARCH=x86', + ], + }], + ['target_arch=="arm"', { + 'nacl_defines': [ + 'NACL_BUILD_ARCH=arm', + 'NACL_BUILD_SUBARCH=32', + 'NACL_TARGET_ARCH=arm', + 'NACL_TARGET_SUBARCH=32', ], }], ], # conditions |