Index: native_client_sdk/src/build_tools/buildbot_run.py |
=================================================================== |
--- native_client_sdk/src/build_tools/buildbot_run.py (revision 122098) |
+++ native_client_sdk/src/build_tools/buildbot_run.py (working copy) |
@@ -480,9 +480,10 @@ |
platform = getos.GetPlatform() |
arch = 'x86' |
- toolchains = ['newlib', 'glibc'] |
if options.pnacl: |
- toolchains.append('pnacl') |
+ toolchains = ['newlib', 'glibc'] |
+ else: |
+ toolchains = ['pnacl'] |
skip = options.examples or options.update |
@@ -540,6 +541,8 @@ |
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) |