vs target: try older VS versions on x64 host but use x86 tools

This commit is contained in:
mpeterv 2016-04-03 16:29:38 +03:00
parent be1c0a25fe
commit b15e6db3a4

View File

@ -1205,10 +1205,10 @@ def main(argv=None):
print("Using cl.exe found in PATH.") print("Using cl.exe found in PATH.")
else: else:
arch = "x64" if platform.machine().endswith("64") else "x86" arch = "x64" if platform.machine().endswith("64") else "x86"
vs_versions = ["14.0", "12.0", "11.0"] if arch == "x64" else ["14.0", "12.0", "11.0", "10.0", "9.0"] vs_versions = ["14.0", "12.0", "11.0", "10.0", "9.0"]
for vs_version in vs_versions: for vs_version in vs_versions:
setup_vs_and_rerun(vs_version, arch) setup_vs_and_rerun(vs_version, "x86" if vs_version in ["9.0", "10.0"] else arch)
sys.exit("Error: couldn't set up MSVC toolchain") sys.exit("Error: couldn't set up MSVC toolchain")
else: else: