build.py will not accept --arch=dartc soon, so removing references and uses of --arch=dartc in th...

tools/make_bundle.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 #
 
 """Tool for automating creation of a Dart bundle."""
 
 import optparse
@@ skipping 13 matching lines @@
     self._top_dir = top_dir
     self._dest = dest
     self._verbose = verbose
     self._skip_build = skip_build
     self._os = utils.GuessOS()
     self._release_build_root = utils.GetBuildRoot(self._os, mode='release',
                                                   arch='ia32')
     self._debug_build_root = utils.GetBuildRoot(self._os, mode='debug',
                                                 arch='ia32')
     self._dartc_build_root = utils.GetBuildRoot(self._os, mode='release',
-                                                arch='dartc')
+                                                arch='ia32')
 
   @staticmethod
   def BuildOptions():
     """Make an option parser with the options supported by this tool.
 
     Returns:
       A newly created OptionParser.
     """
     op = optparse.OptionParser('usage: %prog [options]')
     op.add_option('-d', '--dest')
@@ skipping 89 matching lines @@
     return path.join('native', self._os, utils.GetBuildConf(mode, 'ia32'), name)
 
   def _EnsureExists(self, artifact):
     if not path.exists(artifact):
       raise utils.Error('%s: does not exist' % artifact)
 
   def _BuildArtifacts(self):
     if not self._skip_build:
       self._InvokeTool('runtime', 'build.py', '--arch=ia32',
                        '--mode=release,debug')
-      self._InvokeTool('compiler', 'build.py', '--arch=dartc', '--mode=release')
+      self._InvokeTool('compiler', 'build.py', '--arch=ia32', '--mode=release')
       self._InvokeTool('language', 'build.py', '--arch=ia32', '--mode=release')
 
     release_vm = self._GetReleaseOutput('runtime', 'dart_bin')
     self._EnsureExists(release_vm)
     release_vm_dest = self._GetNativeDest('release', 'dart_bin')
 
     debug_vm = self._GetDebugOutput('runtime', 'dart_bin')
     self._EnsureExists(debug_vm)
     debug_vm_dest = self._GetNativeDest('debug', 'dart_bin')
 
@@ skipping 65 matching lines @@
   try:
     op = BundleMaker.BuildOptions()
     options = BundleMaker.CheckOptions(op, top_dir, cmd_line_args)
   except utils.Error:
     return 1
   sys.exit(BundleMaker(**options).MakeBundle())
 
 
 if __name__ == '__main__':
   main()