diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 18:14:21 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 18:14:21 +0000 |
| commit | 056079f4a14ddd121ab4b6bb009d3ea22bd26e36 (patch) | |
| tree | e4753ad61ab051c752c1b21175080f093e7af22d /native_client_sdk/src | |
| parent | 0390722347f3e4b3dc8feb3a721d20bc510ed8d8 (diff) | |
| download | chromium_src-056079f4a14ddd121ab4b6bb009d3ea22bd26e36.zip chromium_src-056079f4a14ddd121ab4b6bb009d3ea22bd26e36.tar.gz chromium_src-056079f4a14ddd121ab4b6bb009d3ea22bd26e36.tar.bz2 | |
[NaCl SDK] pnacl linux uses 32-bit toolchains.
This will fix the waterfall.
BUG=none
TBR=noelallen@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/10909226
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 16096a9..17765f6 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -23,7 +23,6 @@ import datetime import generate_make import optparse import os -import platform import subprocess import sys @@ -81,11 +80,8 @@ def GetNewlibToolchain(platform, arch): def GetPNaClToolchain(os_platform, arch): tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars') - # Refine the toolchain host arch. For linux, we happen to have - # toolchains for 64-bit hosts. For other OSes, we only have 32-bit binaries. + # Always use 32-bit binaries. arch = 'x86_32' - if os_platform == 'linux' and platform.machine() == 'x86_64': - arch = 'x86_64' tcname = 'naclsdk_pnacl_%s_%s.tgz' % (os_platform, arch) return os.path.join(tcdir, tcname) |