diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-27 20:50:37 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-27 20:50:37 +0000 |
| commit | 77290abc83cfe1fcde1fbed08a3f675de28791a3 (patch) | |
| tree | aa1cf3da8b1e46b70e4e8ff63bec6fae25caa438 /native_client_sdk/src | |
| parent | 60122257eead585ab33dc0c263eaaab2f2ccd61d (diff) | |
| download | chromium_src-77290abc83cfe1fcde1fbed08a3f675de28791a3.zip chromium_src-77290abc83cfe1fcde1fbed08a3f675de28791a3.tar.gz chromium_src-77290abc83cfe1fcde1fbed08a3f675de28791a3.tar.bz2 | |
Change from 64 to 32 for PNaCl toolchains and add Mac trybot
All pnacl toolchains are 32 bit executables for the host OS. The name change
reflects that the toolchain can run on 32 bit host, and the default "64" does
not make sense since we generate to a architecture independant form. This
also adds the Mac Pnacl SDK trybot to the try script.
R=sehr@google.com
Review URL: https://chromiumcodereview.appspot.com/9865034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 3 | ||||
| -rwxr-xr-x | native_client_sdk/src/sdktry.sh | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 01a5272..3eeafd6 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -15,6 +15,7 @@ BUILDBOT_BUILDERNAME to determine whether the script is run locally and whether it should upload an SDK to file storage (GSTORE) """ + # std python includes import optparse import os @@ -92,7 +93,7 @@ def GetNewlibToolchain(platform, arch): def GetPNaClToolchain(platform, arch): tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars') if arch == 'x86': - tcname = 'naclsdk_pnacl_%s_%s_64.tgz' % (platform, arch) + tcname = 'naclsdk_pnacl_%s_%s_32.tgz' % (platform, arch) else: buildbot_common.ErrorExit('Unknown architecture.') return os.path.join(tcdir, tcname) diff --git a/native_client_sdk/src/sdktry.sh b/native_client_sdk/src/sdktry.sh index deac1e2..7348597 100755 --- a/native_client_sdk/src/sdktry.sh +++ b/native_client_sdk/src/sdktry.sh @@ -11,6 +11,7 @@ gcl try $* \ -b naclsdkm-linux \ -b naclsdkm-linux \ -b naclsdkm-pnacl-linux \ + -b naclsdkm-pnacl-mac \ -b naclsdkm-windows32 \ -b naclsdkm-windows64 \ -S svn://svn.chromium.org/chrome-try/try-nacl |