Revert 122113 - Fix pnacl SDK builder

native_client_sdk/src/build_tools/buildbot_run.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Entry point for both build and try bots
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 462 matching lines @@
       action='store_true', dest='skip_tar', default=False)
   parser.add_option('--archive', help='Force the archive step.',
       action='store_true', dest='archive', default=False)
   parser.add_option('--release', help='PPAPI release version.',
       dest='release', default=None)
   
   options, args = parser.parse_args(args[1:])
   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
   skip_update = skip
   skip_untar = skip
   skip_build = skip
   skip_tar = skip or options.skip_tar
 
   if options.examples: skip_examples = False
   if options.update: skip_update = False
@@ skipping 36 matching lines @@
     BuildStep('Add MAKE')
     http_download.HttpDownload(GSTORE + MAKE,
                              os.path.join(pepperdir, 'tools' ,'make.exe'))
 
   if not skip_examples:
     CopyExamples(pepperdir, toolchains)
 
   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)
 
   # Archive on non-trybots.
   if options.archive or '-sdk' in os.environ.get('BUILDBOT_BUILDERNAME', ''):
     BuildStep('Archive build')
     Archive(tarname)
 
   if not skip_examples:
     BuildStep('Test Build Examples')
     filelist = os.listdir(os.path.join(pepperdir, 'examples'))
     for filenode in filelist:
       dirnode = os.path.join(pepperdir, 'examples', filenode)
       makefile = os.path.join(dirnode, 'Makefile')
       if os.path.isfile(makefile):
         print "\n\nMake: " + dirnode
         Run(['make', 'all', '-j8'], cwd=os.path.abspath(dirnode), shell=True)
 
 # Build SDK Tools
 #  if not skip_update:
 #    BuildUpdater()
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))