Skip to content

Commit 22919a9

Browse files
authored
Merge pull request #71818 from compnerd/curl
utils: update curl to 8.5.0
2 parents 976f2e1 + 2c15456 commit 22919a9

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
@@ -1143,8 +1143,8 @@ function Build-CURL([Platform]$Platform, $Arch) {
11431143

11441144
Build-CMakeProject `
11451145
-Src $SourceCache\curl `
1146-
-Bin "$($Arch.BinaryCache)\$Platform\curl-8.4.0" `
1147-
-InstallTo "$LibraryRoot\curl-8.4.0\usr" `
1146+
-Bin "$($Arch.BinaryCache)\$Platform\curl-8.5.0" `
1147+
-InstallTo "$LibraryRoot\curl-8.5.0\usr" `
11481148
-Arch $Arch `
11491149
-Platform $Platform `
11501150
-BuildTargets default `
@@ -1357,7 +1357,7 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
13571357
# and fails with an ICU data object file icudt69l_dat.obj. This
13581358
# matters to X86 only.
13591359
CMAKE_Swift_FLAGS = if ($Arch -eq $ArchX86) { @("-Xlinker", "/SAFESEH:NO") } else { "" };
1360-
CURL_DIR = "$LibraryRoot\curl-8.4.0\usr\lib\$Platform\$ShortArch\cmake\CURL";
1360+
CURL_DIR = "$LibraryRoot\curl-8.5.0\usr\lib\$Platform\$ShortArch\cmake\CURL";
13611361
ICU_DATA_LIBRARY_RELEASE = "$LibraryRoot\icu-69.1\usr\lib\$Platform\$ShortArch\sicudt69.lib";
13621362
ICU_I18N_LIBRARY_RELEASE = "$LibraryRoot\icu-69.1\usr\lib\$Platform\$ShortArch\sicuin69.lib";
13631363
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.1"

0 commit comments

Comments
 (0)