diff --git a/.github/workflows/test-windows-arm64.yml b/.github/workflows/test-windows-arm64.yml index b05f4e40ef..0df27ebe3f 100644 --- a/.github/workflows/test-windows-arm64.yml +++ b/.github/workflows/test-windows-arm64.yml @@ -110,14 +110,14 @@ jobs: $ucrt = Join-Path $env:WindowsSdkDir "Lib\$sdk\ucrt\arm64" $um = Join-Path $env:WindowsSdkDir "Lib\$sdk\um\arm64" $msvc = Join-Path $env:VCToolsInstallDir "lib\arm64" - $host = Join-Path $env:VCToolsInstallDir "bin\HostX64\arm64" + $bin = Join-Path $env:VCToolsInstallDir "bin\HostX64\arm64" $kit = Join-Path $env:WindowsSdkDir "bin\$sdk\x64" - $link = Join-Path $host "link.exe" - $miss = @($ucrt, $um, $msvc, $host, $link) | Where-Object { !(Test-Path $_) } + $link = Join-Path $bin "link.exe" + $miss = @($ucrt, $um, $msvc, $bin, $link) | Where-Object { !(Test-Path $_) } if ($miss) { throw "missing ARM64 tool paths: $($miss -join ', ')" } "LIB=$ucrt;$um;$msvc" | Add-Content -Path $env:GITHUB_ENV "CARGO_TARGET_AARCH64_PC_WINDOWS_MSVC_LINKER=$link" | Add-Content -Path $env:GITHUB_ENV - Add-Content -Path $env:GITHUB_PATH -Value $host + Add-Content -Path $env:GITHUB_PATH -Value $bin Add-Content -Path $env:GITHUB_PATH -Value $kit Write-Host "Using linker: $link" Write-Host "Using LIB: $ucrt;$um;$msvc"