deps.windows: Fix architecture mismatch when building on ARM64 host

obsproject · Jan 29, 2025 · 14b180d · 14b180d
1 parent c9f8ada
commit 14b180d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/deps.windows/40-detours.ps1 b/deps.windows/40-detours.ps1
@@ -40,7 +40,7 @@ function Build {
         Target = $Target
     }
 
-    if ( $Target -eq 'x86' ) {
+    if ( $env:CI -ne $null -and $Target -eq 'x86' ) {
         $Params += @{
             HostArchitecture = $Target
         }

diff --git a/utils.pwsh/Setup-Host.ps1 b/utils.pwsh/Setup-Host.ps1
@@ -35,11 +35,4 @@ function Cleanup {
     Log-Debug "Running Cleanup actions"
 }
 
-function Get-HostArchitecture {
-    $Host64Bit = [System.Environment]::Is64BitOperatingSystem
-    $HostArchitecture = ('x86', 'x64')[$Host64Bit]
-
-    return $HostArchitecture
-}
-
-$script:HostArchitecture = Get-HostArchitecture
+$script:HostArchitecture = ([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture).ToString().ToLower()