[zorg] r343645 - Fix Windows x64 architecture detection

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Tue Oct  2 15:46:35 2018
New Revision: 343645

URL: http://llvm.org/viewvc/llvm-project?rev=343645&view=rev
Log:
Fix Windows x64 architecture detection

We do want x64 if the machine is x64 even if python is 32-bit.

Modified:
    zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py

Modified: zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py?rev=343645&r1=343644&r2=343645&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/annotated/annotated_builder.py Tue Oct  2 15:46:35 2018
@@ -361,7 +361,11 @@ def get_vcvars(vs_tools, arch):
     It doesn't work when VS is not installed at the default location.
     """
     if not arch:
-        arch = os.environ['PROCESSOR_ARCHITECTURE'].lower()
+        # First check the wow64 processor architecture, since python is probably
+        # 32-bit, then fall back to PROCESSOR_ARCHITECTURE.
+        arch = os.environ['PROCESSOR_ARCHITEW6432'].lower()
+        if not arch:
+            arch = os.environ['PROCESSOR_ARCHITECTURE'].lower()
     else:
         arch = arch.lower()