From 26cdfb77eca89ffd8093bcd9a50e14307cc38375 Mon Sep 17 00:00:00 2001 From: Alexander Ovchinnikov <8490695+Alovchin91@users.noreply.github.com> Date: Tue, 1 Jun 2021 16:46:22 +0200 Subject: [PATCH] Probe for ARM64 MSBuild (#605) Set MSBuild Platform property to ARM64 for aarch64 targets --- src/windows_registry.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/windows_registry.rs b/src/windows_registry.rs index 51f7df0a..d2d212c7 100644 --- a/src/windows_registry.rs +++ b/src/windows_registry.rs @@ -277,6 +277,9 @@ mod impl_ { if target.contains("x86_64") { tool.env.push(("Platform".into(), "X64".into())); } + if target.contains("aarch64") { + tool.env.push(("Platform".into(), "ARM64".into())); + } Some(tool) }) .next() @@ -407,6 +410,9 @@ mod impl_ { if target.contains("x86_64") { tool.env.push(("Platform".into(), "X64".into())); } + if target.contains("aarch64") { + tool.env.push(("Platform".into(), "ARM64".into())); + } tool }) } @@ -810,10 +816,12 @@ mod impl_ { "16.0" => { find_msbuild_vs16("x86_64-pc-windows-msvc").is_some() || find_msbuild_vs16("i686-pc-windows-msvc").is_some() + || find_msbuild_vs16("aarch64-pc-windows-msvc").is_some() } "15.0" => { find_msbuild_vs15("x86_64-pc-windows-msvc").is_some() || find_msbuild_vs15("i686-pc-windows-msvc").is_some() + || find_msbuild_vs15("aarch64-pc-windows-msvc").is_some() } "12.0" | "14.0" => LOCAL_MACHINE .open(&OsString::from(format!(