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, 5 insertions, 9 deletions
diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py index bf30feb..4f897d8 100755 --- a/build/download_nacl_toolchains.py +++ b/build/download_nacl_toolchains.py @@ -34,8 +34,7 @@ def Main(args): # gclient sync time for developers, or standard Chrome bots. if '--optional-pnacl' in args: args.remove('--optional-pnacl') - buildbot_name = os.environ.get('BUILDBOT_BUILDERNAME', '') - if buildbot_name.contains('pnacl') and buildbot_name.contains('sdk'): + if os.environ.get('BUILDBOT_BUILDERNAME', '') == 'linux_pnacl_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 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) |