Linux: Handle GYP_DEFINES="host_arch=x86_64" in third_party/binutils/download.py.

third_party/binutils/download.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 # vim: set ts=2 sw=2 et sts=2 ai:
 
 """Minimal tool to download binutils from Google storage.
 
 TODO(mithro): Replace with generic download_and_extract tool.
 """
@@ skipping 24 matching lines @@
   assert not os.path.exists(filename)
   with file(filename, 'w') as f:
     f.write(content)
     f.write('\n')
 
 
 def GetArch():
   gyp_host_arch = re.search(
       'host_arch=([^ ]*)', os.environ.get('GYP_DEFINES', ''))
   if gyp_host_arch:
-    return gyp_host_arch.group(1)
+    arch = gyp_host_arch.group(1)
+    # This matches detect_host_arch.py.
+    if arch == 'x86_64':
+      return 'x64'
+    return arch
 
   return subprocess.check_output(['python', DETECT_HOST_ARCH]).strip()
 
 
 def FetchAndExtract(arch):
   archdir = os.path.join(BINUTILS_DIR, 'Linux_' + arch)
   tarball = os.path.join(archdir, BINUTILS_FILE)
   outdir = os.path.join(archdir, BINUTILS_OUT)
 
   sha1file = tarball + '.sha1'
@@ skipping 49 matching lines @@
     if ret != 0:
       return ret
     # Fetch the x64 toolchain as well for official bots with 64-bit kernels.
     return FetchAndExtract('x64')
   print "Host architecture %s is not supported." % arch
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))