Linux: install-debian.wheezy.sysroot.py should use build/detect_host_arch.py to detect the host arc…

chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 # Script to install a Debian Wheezy sysroot for making official Google Chrome
 # Linux builds.
 # The sysroot is needed to make Chrome work for Debian Wheezy.
 # This script can be run manually but is more often run as part of gclient
 # hooks. When run from hooks this script should be a no-op on non-linux
@@ skipping 62 matching lines @@
 
     # Check for optional target_arch and only install for that architecture.
     # If target_arch is not specified, then only install for the host
     # architecture.
     host_arch = ''
     if 'target_arch=x64' in gyp_defines:
       host_arch = 'amd64'
     elif 'target_arch=ia32' in gyp_defines:
       host_arch = 'i386'
     else:
-      # Figure out host arch, like the host_arch variable in build/common.gypi.
-      machine_type = platform.machine()
-      if machine_type in ['amd64', 'x86_64']:
+      # Figure out host arch using build/detect_host_arch.py.
+      SRC_DIR = os.path.abspath(
+          os.path.join(SCRIPT_DIR, '..', '..', '..', '..'))
+      sys.path.append(os.path.join(SRC_DIR, 'build'))
+      import detect_host_arch
+
+      detected_host_arch = detect_host_arch.HostArch()
+      if detected_host_arch == 'x64':
         host_arch = 'amd64'
-      elif re.match('(i[3-6]86|i86pc)$', machine_type):
+      elif detected_host_arch == 'ia32':
         host_arch = 'i386'
     if host_arch != options.arch:
       return 0
 
   # The sysroot directory should match the one specified in build/common.gypi.
   # TODO(thestig) Consider putting this else where to avoid having to recreate
   # it on every build.
   linux_dir = os.path.dirname(SCRIPT_DIR)
   if options.arch == 'amd64':
     sysroot = os.path.join(linux_dir, SYSROOT_DIR_AMD64)
@@ skipping 34 matching lines @@
 
 if __name__ == '__main__':
   parser = optparse.OptionParser('usage: %prog [OPTIONS]')
   parser.add_option('', '--linux-only', dest='linux_only', action='store_true',
                     default=False, help='Only install sysroot for official '
                                         'Linux builds')
   parser.add_option('', '--arch', dest='arch',
                     help='Sysroot architecture, i386 or amd64')
   options, args = parser.parse_args()
   sys.exit(main(options))