Addressed some buildbot errors and comments on the checkin by Antoine on python-dev.
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 977962f..59315f7 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -47,7 +47,8 @@
return True
return False
_sys_home = getattr(sys, '_home', None)
-if _sys_home and os.name == 'nt' and _sys_home.lower().endswith('pcbuild'):
+if _sys_home and os.name == 'nt' and \
+ _sys_home.lower().endswith(('pcbuild', 'pcbuild\\amd64')):
_sys_home = os.path.dirname(_sys_home)
def _python_build():
if _sys_home: