- Redo cross-build detection.

tools/utils.py

 # Copyright (c) 2012, 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.
 
 # This file contains a set of utilities functions used by other Python-based
 # scripts.
 
 import commands
 import os
 import platform
@@ skipping 195 matching lines @@
 
 
 # Mapping table between OS and build output location.
 BUILD_ROOT = {
   'win32': os.path.join('build'),
   'linux': os.path.join('out'),
   'freebsd': os.path.join('out'),
   'macos': os.path.join('xcodebuild'),
 }
 
+ARCH_FAMILY = {
+  'ia32': 'ia32',
+  'x64': 'ia32',
+  'arm': 'arm',
+  'mips': 'mips',
+  'simarm': 'ia32',
+  'simmips': 'ia32',
+}
+
 ARCH_GUESS = GuessArchitecture()
 BASE_DIR = os.path.abspath(os.path.join(os.curdir, '..'))
 DART_DIR = os.path.abspath(os.path.join(__file__, '..', '..'))
 
 def GetBuildbotGSUtilPath():
   gsutil = '/b/build/scripts/slave/gsutil'
   if platform.system() == 'Windows':
     gsutil = 'e:\\\\b\\build\\scripts\\slave\\gsutil'
   return gsutil
 
 def GetBuildMode(mode):
   return BUILD_MODES[mode]
 
+def GetArchFamily(arch):
+  return ARCH_FAMILY[arch]
+
 def GetBuildConf(mode, arch, conf_os=None):
   if conf_os == 'android':
     return '%s%s%s' % (GetBuildMode(mode), conf_os.title(), arch.upper())
   else:
     # Ask for a cross build if the host and target architectures don't match.
     host_arch = ARCH_GUESS
-    target_arch = arch
-    if target_arch == 'x64':
-      target_arch = 'ia32'
-      print "GetBuildConf: Rewritten %s to %s\n" % (arch, target_arch)
-    if host_arch == 'x64':
-      host_arch = 'ia32'
-      print "GetBuildConf: Rewritten %s to %s\n" % (arch, host_arch)
     cross_build = ''
-    if host_arch != target_arch:
+    if GetArchFamily(host_arch) != GetArchFamily(arch):
       print "GetBuildConf: Cross-build of %s on %s\n" % (arch, host_arch)
       cross_build = 'X'
     return '%s%s%s' % (GetBuildMode(mode), cross_build, arch.upper())
 
 def GetBuildDir(host_os, target_os):
   return BUILD_ROOT[host_os]
 
 def GetBuildRoot(host_os, mode=None, arch=None, target_os=None):
   build_root = GetBuildDir(host_os, target_os)
   if mode:
@@ skipping 300 matching lines @@
     os.chdir(self._working_directory)
 
   def __exit__(self, *_):
     print "Enter directory = ", self._old_cwd
     os.chdir(self._old_cwd)
 
 
 if __name__ == "__main__":
   import sys
   Main(sys.argv)