From 96b02724a0e39548fa64ceeaa3f87e03d882d61d Mon Sep 17 00:00:00 2001 From: starr-openai Date: Wed, 13 May 2026 16:47:23 -0700 Subject: [PATCH] Prefer lld-link in MSVC setup action --- .github/actions/setup-msvc-env/action.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-msvc-env/action.yml b/.github/actions/setup-msvc-env/action.yml index 3903d383ff..a032504dc1 100644 --- a/.github/actions/setup-msvc-env/action.yml +++ b/.github/actions/setup-msvc-env/action.yml @@ -93,10 +93,14 @@ runs: throw "VCToolsInstallDir was not exported by VsDevCmd.bat" } - $linker = Join-Path $vcToolsInstallDir "bin\Host${hostArch}\${targetArch}\link.exe" + $linker = Join-Path $installPath "VC\Tools\Llvm\x64\bin\lld-link.exe" if (-not (Test-Path $linker)) { - throw "MSVC linker not found at $linker" + $linker = Join-Path $vcToolsInstallDir "bin\Host${hostArch}\${targetArch}\link.exe" + } + if (-not (Test-Path $linker)) { + throw "Windows linker not found at $linker" } + Write-Output "Using Windows linker: $linker" $cargoTarget = "${{ inputs.target }}".ToUpperInvariant().Replace("-", "_") "CARGO_TARGET_${cargoTarget}_LINKER=$linker" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append