Skip to content

Fix windows2025 andium #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlopi merged 3 commits into from
Jun 12, 2026
Merged

Fix windows2025 andium #369

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09a0a23
Force cl as C/C++ compiler on windows 2025
smvv May 12, 2026
1368661
Call visual studio 18's vcvars.bat
smvv May 12, 2026
6046d9c
Fix variable expansion
smvv May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .github/workflows/_extension_distribution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,8 +766,8 @@ jobs:
# Misc
BUILD_SHELL: ${{ inputs.build_duckdb_shell && '1' || '0' }}
DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
CC: ${{ (matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw') && 'gcc' || '' }}
CXX: ${{ (matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw') && 'g++' || '' }}
CC: ${{ (matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw') && 'gcc' || 'cl' }}
CXX: ${{ (matrix.duckdb_arch == 'windows_amd64_rtools' || matrix.duckdb_arch == 'windows_amd64_mingw') && 'g++' || 'cl' }}
GEN: ninja

steps:
Expand Down Expand Up @@ -949,12 +949,21 @@ jobs:
EXT_FLAGS: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
shell: cmd
run: |
setlocal EnableDelayedExpansion
if "%DUCKDB_PLATFORM_RTOOLS%" == "0" (
set "VCVARS_BAT="
if "%DUCKDB_PLATFORM%" == "windows_amd64" (
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
set "VCVARS_BAT=vcvars64.bat"
)
if "%DUCKDB_PLATFORM%" == "windows_arm64" (
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat"
set "VCVARS_BAT=vcvarsarm64.bat"
)
if defined VCVARS_BAT (
if exist "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\!VCVARS_BAT!" (
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\!VCVARS_BAT!"
) else (
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\!VCVARS_BAT!"
)
)
REM Rename link.exe to link-git.exe to avoid conflicts with git supplied linker.
mv "C:\Program Files\Git\usr\bin\link.exe" "C:\Program Files\Git\usr\bin\link-git.exe"
Expand Down
Loading