Skip to content

Commit dd5d6fa

Browse files
committedFeb 22, 2024··
utils: update curl to 8.5.0
CURL 8.5.0 contains a change to `fseeko` handling which is required to build for Android with the newer NDKs.

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎utils/build.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1119,8 +1119,8 @@ function Build-CURL([Platform]$Platform, $Arch) {
11191119

11201120
Build-CMakeProject `
11211121
-Src $SourceCache\curl `
1122-
-Bin "$($Arch.BinaryCache)\curl-8.4.0" `
1123-
-InstallTo "$LibraryRoot\curl-8.4.0\usr" `
1122+
-Bin "$($Arch.BinaryCache)\curl-8.5.0" `
1123+
-InstallTo "$LibraryRoot\curl-8.5.0\usr" `
11241124
-Arch $Arch `
11251125
-BuildTargets default `
11261126
-Defines @{
@@ -1325,7 +1325,7 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
13251325
# and fails with an ICU data object file icudt69l_dat.obj. This
13261326
# matters to X86 only.
13271327
CMAKE_Swift_FLAGS = if ($Arch -eq $ArchX86) { @("-Xlinker", "/SAFESEH:NO") } else { "" };
1328-
CURL_DIR = "$LibraryRoot\curl-8.4.0\usr\lib\$ShortArch\cmake\CURL";
1328+
CURL_DIR = "$LibraryRoot\curl-8.5.0\usr\lib\$ShortArch\cmake\CURL";
13291329
ICU_DATA_LIBRARY_RELEASE = "$LibraryRoot\icu-69.1\usr\lib\$ShortArch\sicudt69.lib";
13301330
ICU_I18N_LIBRARY_RELEASE = "$LibraryRoot\icu-69.1\usr\lib\$ShortArch\sicuin69.lib";
13311331
ICU_ROOT = "$LibraryRoot\icu-69.1\usr";

‎utils/update_checkout/update-checkout-config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
"swift-experimental-string-processing": "swift/main",
147147
"wasi-libc": "wasi-sdk-20",
148148
"wasmkit": "0.0.3",
149-
"curl": "curl-8_4_0",
149+
"curl": "curl-8_5_0",
150150
"icu": "maint/maint-69",
151151
"libxml2": "v2.11.5",
152152
"zlib": "v1.3"

0 commit comments

Comments
 (0)
Please sign in to comment.