diff options
| -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..bf30feb 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.contains('pnacl') and buildbot_name.contains('sdk'): 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) |