- Intel architecture rewriting needs to happen both ways.

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 218 matching lines @@
 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)
-    cross_build = ''
+    if host_arch == 'x64':
+      target_arch = 'ia32'
+      print "GetBuildConf: Rewritten %s to %s\n" % (arch, host_arch)
+   cross_build = ''
     if host_arch != target_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)
@@ skipping 301 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)