[zorg] r258738 - Make x86 MSVC builds use the x64 -> x86 cross compiler.

[Zachary Turner via llvm-commits]

Author: zturner
Date: Mon Jan 25 16:54:13 2016
New Revision: 258738

URL: http://llvm.org/viewvc/llvm-project?rev=258738&view=rev
Log:
Make x86 MSVC builds use the x64 -> x86 cross compiler.

Differential Revision: http://reviews.llvm.org/D16477
Reviewed By: Galina Kistanova

Modified:
    zorg/trunk/zorg/buildbot/builders/Util.py

Modified: zorg/trunk/zorg/buildbot/builders/Util.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Util.py?rev=258738&r1=258737&r2=258738&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Util.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Util.py Mon Jan 25 16:54:13 2016
@@ -1,7 +1,9 @@
 import buildbot.status.results
 
 def getVisualStudioEnvironment(vs=r"""%VS120COMNTOOLS%""", target_arch=None):
-    arch_arg = {'x86': 'x86', 'x64': 'amd64', 'amd64': 'amd64'}.get(target_arch, '%PROCESSOR_ARCHITECTURE%')
+    # x86 builds should use the 64 bit -> x86 cross compilation toolchain to avoid
+    # out of memory linker errors
+    arch_arg = {'x86': 'amd64_x86', 'x64': 'amd64', 'amd64': 'amd64'}.get(target_arch, '%PROCESSOR_ARCHITECTURE%')
     vcvars_command = "\"" + "\\".join((vs, '..','..','VC', 'vcvarsall.bat')) + "\""
     vcvars_command = "%s %s && set" % (vcvars_command, arch_arg)
     return vcvars_command