From eeabfad146f5ac45b0e4b5f0060b9c4cf75fcee2 Mon Sep 17 00:00:00 2001
From: Jeremy Sinclair <4016293+snickler@users.noreply.github.com>
Date: Fri, 21 Jan 2022 14:10:58 -0500
Subject: [PATCH] [vcpkg] Fix bootstrap for windows arm64 (#22605)

* Update bootstrap.ps1 to properly support arm64

* Add tls12-download-arm64 from 2021-12-09 release

* Add reference to tls12-download-arm64 back in

* Update scripts/bootstrap.ps1

Revert back to x86 downloader

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* Revert "Add tls12-download-arm64 from 2021-12-09 release"

This reverts commit 26273191d29663a2144f4c71f8e3e71e3e30dbbd.

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
---
 scripts/bootstrap.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 6c98a9853f..960443567b 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -46,8 +46,8 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
 Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
 
 $versionDate = '2021-12-09'
-if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') {
-    & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe"
+if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") {
+    & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe"
 } else {
     & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
 }