Merge nucleic/humble-fern-egret-60xo into dev

This commit is contained in:
2026-07-28 21:35:20 -07:00
parent 7784c4e3f4
commit 301788a996
3 changed files with 29 additions and 3 deletions
+6 -3
View File
@@ -74,10 +74,13 @@ function Initialize-SQLite {
if (-not $Triplet) {
# -static-md links SQLite statically against the DYNAMIC CRT — matching what the
# Swift toolchain uses, so the CRT agrees and there's no sqlite3.dll to place
# beside every test binary.
# beside every test binary. `-nucleic` is our overlay triplet (windows/vcpkg-triplets):
# same thing plus SQLITE_ENABLE_SNAPSHOT, which GRDB's system-SQLite path requires and
# the stock port compiles out.
$arch = if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { 'arm64' } else { 'x64' }
$script:Triplet = "$arch-windows-static-md"
$script:Triplet = "$arch-windows-static-md-nucleic"
}
$overlay = Join-Path $repo 'windows\vcpkg-triplets'
# `%LOCALAPPDATA%\vcpkg` is NOT a candidate install root, and must never be a clone target:
# that path is vcpkg's own per-user DATA directory (registries, downloads, and the
@@ -121,7 +124,7 @@ function Initialize-SQLite {
$prefix = Join-Path $root "installed\$Triplet"
if (-not (Test-Path (Join-Path $prefix 'include\sqlite3.h'))) {
Write-Step "Installing sqlite3:$Triplet (one time, a few minutes)"
& (Join-Path $root 'vcpkg.exe') install "sqlite3:$Triplet" | Out-Host
& (Join-Path $root 'vcpkg.exe') install "sqlite3:$Triplet" "--overlay-triplets=$overlay" | Out-Host
if ($LASTEXITCODE -ne 0) { throw "vcpkg install sqlite3:$Triplet failed" }
}