diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 18:29:38 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 18:29:38 +0000 |
| commit | 31b167ef69a3115ed822daf3d4e8acef308f7c20 (patch) | |
| tree | 90a7456c54a0e5aceccd4d45f88b94cb546e1e25 /native_client_sdk | |
| parent | af472cbae6744909880391d82393e76bfe074b8c (diff) | |
| download | chromium_src-31b167ef69a3115ed822daf3d4e8acef308f7c20.zip chromium_src-31b167ef69a3115ed822daf3d4e8acef308f7c20.tar.gz chromium_src-31b167ef69a3115ed822daf3d4e8acef308f7c20.tar.bz2 | |
Revert 122113 - Fix pnacl SDK builder
Change download script to make sure 'pnacl' sdk builder gets toolchain.
Change tarball name for pnacl build to avoid collision.
For now have pnacl toolchain only build pnacl pieces.
This change affects SDK builders not Chrome directly.
TBR= sehr@google.com
BUG= 11292
Review URL: https://chromiumcodereview.appspot.com/9407014
TBR=noelallen@google.com
Review URL: https://chromiumcodereview.appspot.com/9407015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/buildbot_run.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py index 860d68f..46ccb96 100755 --- a/native_client_sdk/src/build_tools/buildbot_run.py +++ b/native_client_sdk/src/build_tools/buildbot_run.py @@ -480,11 +480,10 @@ def main(args): platform = getos.GetPlatform() arch = 'x86' - if not options.pnacl: - toolchains = ['newlib', 'glibc'] - else: - toolchains = ['pnacl'] - print 'Building: ' + ' '.join(toolchains) + toolchains = ['newlib', 'glibc'] + if options.pnacl: + toolchains.append('pnacl') + skip = options.examples or options.update skip_examples = skip @@ -541,8 +540,6 @@ def main(args): if not skip_tar: BuildStep('Tar Pepper Bundle') tarname = 'naclsdk_' + platform + '.bz2' - if 'pnacl' in toolchains: - tarname = 'p' + tarname tarfile = os.path.join(OUT_DIR, tarname) Run([sys.executable, CYGTAR, '-C', OUT_DIR, '-cjf', tarfile, 'pepper_' + pepper_ver], cwd=NACL_DIR) |