diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 19:06:19 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 19:06:19 +0000 |
| commit | 9a28816a0ba445495d0574c7c810ac71a06afdd8 (patch) | |
| tree | 982d52e5a24fe5194cd976c8f1eeb986785ff456 /o3d | |
| parent | a0c439fae63b8572d58d5e609b90fa2aeff13561 (diff) | |
| download | chromium_src-9a28816a0ba445495d0574c7c810ac71a06afdd8.zip chromium_src-9a28816a0ba445495d0574c7c810ac71a06afdd8.tar.gz chromium_src-9a28816a0ba445495d0574c7c810ac71a06afdd8.tar.bz2 | |
Provide a default definition of the target_arch variable on Linux to
work around a problem in NaCl's GYP files where it infers 32-bit on
Linux in native_client/build/common.gypi.
A fix in Native Client and a DEPS roll in O3D are still needed to make
the Linux build fully work with the newer NaCl.
BUG=none
TEST=built O3D on Linux
Review URL: http://codereview.chromium.org/2851003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/build/common_global.gypi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/o3d/build/common_global.gypi b/o3d/build/common_global.gypi index 6e62f1a..031f7eb 100644 --- a/o3d/build/common_global.gypi +++ b/o3d/build/common_global.gypi @@ -14,6 +14,13 @@ [ 'OS == "linux"', { 'use_system_zlib': 0, 'use_system_libjpeg': 0, + 'nacl_standalone': 1, + # nacl_standalone=1 is broken because nacl's build/common.gypi + # insists on building 32-bit. Force target_arch to be defined + # so that nacl's override isn't used. + # Note: this variable setting is copied from nacl's + # build/common.gypi so that it has the exact same semantics. + 'target_arch%': '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/arm.*/arm/")' }], [ 'OS == "win"', { 'nacl_standalone': 1, |