Revert 122113 - Fix pnacl SDK builder

native_client_sdk/src/build_tools/buildbot_run.py

Index: native_client_sdk/src/build_tools/buildbot_run.py
===================================================================
--- native_client_sdk/src/build_tools/buildbot_run.py	(revision 122114)
+++ native_client_sdk/src/build_tools/buildbot_run.py	(working copy)
@@ -480,11 +480,10 @@
   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 @@
   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)