diff options
| author | noelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 21:14:00 +0000 |
|---|---|---|
| committer | noelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 21:14:00 +0000 |
| commit | fd84af21babc11b4334c346e3100fc76a4195179 (patch) | |
| tree | 35bb9532c89132d561566a1e0ce86ddd649509eb | |
| parent | f81678079f43754984785680772748dca45219b9 (diff) | |
| download | chromium_src-fd84af21babc11b4334c346e3100fc76a4195179.zip chromium_src-fd84af21babc11b4334c346e3100fc76a4195179.tar.gz chromium_src-fd84af21babc11b4334c346e3100fc76a4195179.tar.bz2 | |
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.
TBR= sehr@google.com
BUG=11292
Review URL: http://codereview.chromium.org/9408003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122149 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | build/download_nacl_toolchains.py | 3 | ||||
| -rwxr-xr-x | native_client_sdk/src/build_tools/buildbot_run.py | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py index 4f897d8..2fdfa00 100755 --- a/build/download_nacl_toolchains.py +++ b/build/download_nacl_toolchains.py @@ -34,7 +34,8 @@ def Main(args): # gclient sync time for developers, or standard Chrome bots. if '--optional-pnacl' in args: args.remove('--optional-pnacl') - if os.environ.get('BUILDBOT_BUILDERNAME', '') == 'linux_pnacl_sdk': + buildbot_name = os.environ.get('BUILDBOT_BUILDERNAME', '') + if buildbot_name.find('pnacl') >= 0 and buildbot_name.find('sdk') >= 0: print '\n*** DOWNLOADING PNACL TOOLCHAIN ***\n' else: args.append('--no-pnacl') diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py index 46ccb96..860d68f 100755 --- a/native_client_sdk/src/build_tools/buildbot_run.py +++ b/native_client_sdk/src/build_tools/buildbot_run.py @@ -480,10 +480,11 @@ def main(args): platform = getos.GetPlatform() arch = 'x86' - toolchains = ['newlib', 'glibc'] - if options.pnacl: - toolchains.append('pnacl') - + if not options.pnacl: + toolchains = ['newlib', 'glibc'] + else: + toolchains = ['pnacl'] + print 'Building: ' + ' '.join(toolchains) skip = options.examples or options.update skip_examples = skip @@ -540,6 +541,8 @@ 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) |