Linux: Switch 32-bit official builds to use the bundled 64-bit linker.

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 29 matching lines @@
 
 def GetArch():
   gyp_host_arch = re.search(
       'host_arch=([^ ]*)', os.environ.get('GYP_DEFINES', ''))
   if gyp_host_arch:
     return gyp_host_arch.group(1)
 
   return subprocess.check_output(['python', DETECT_HOST_ARCH]).strip()
 
 
-def main(args):
-  if not sys.platform.startswith('linux'):
-    return 0
-
-  archdir = os.path.join(BINUTILS_DIR, 'Linux_' + GetArch())
+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'
   if not os.path.exists(sha1file):
-    print "WARNING: No binutils found for your architecture (%s)!" % GetArch()
+    print "WARNING: No binutils found for your architecture (%s)!" % arch
     return 0
 
   checksum = ReadFile(sha1file)
 
   stampfile = tarball + '.stamp'
   if os.path.exists(stampfile):
     if (os.path.exists(tarball) and
         os.path.exists(outdir) and
         checksum == ReadFile(stampfile)):
       return 0
@@ skipping 18 matching lines @@
   print "Extracting", tarball
   subprocess.check_call(['tar', 'axf', tarball], cwd=outdir)
 
   for tool in BINUTILS_TOOLS:
     assert os.path.exists(os.path.join(outdir, tool))
 
   WriteFile(stampfile, checksum)
   return 0
 
 
+def main(args):
+  if not sys.platform.startswith('linux'):
+    return 0
+
+  arch = GetArch()

[mithro-old, 2014/04/28 19:01:21]

Maybe it should be;

------------------------------------
archs = GetArch()
for arch in archs:
  if arch not in ('x64', 'ia32'):
    print "Error"
    return 1

  if not FetchAndExtract(arch):
    print "Error"
    return 1
------------------------------------

[Lei Zhang, 2014/04/28 19:13:22]

GetArch() hasn't changed, for a machine with a 64-bit kernel but 32-bit
userland, it's going to only return 'ia32'.

+  if arch == 'x64':
+    return FetchAndExtract(arch)
+  if arch == 'ia32':
+    ret = FetchAndExtract(arch)
+    if ret != 0:
+      return ret
+    # Fetch the x64 toolchain as well for official bots with 64-bit kernels.
+    return FetchAndExtract('x64')

[mithro-old, 2014/04/28 19:01:21]

I think this script could detect the GYP_DEFINEs stuff here?

[Lei Zhang, 2014/04/28 19:13:22]

It's simpler to just install both toolchains. Not that many people build on
32-bit hosts.

+  print "Host architecture %s is not supported." % arch
+  return 1
+
+
 if __name__ == '__main__':
   sys.exit(main(sys.argv))