Skip to content

Commit 3fd9f11

Browse files
committed
build: Update swift-crypto 3.12.3 -> 3.12.5
Changelog: * apple/swift-crypto@d79c573 Make Build: Disable CMP0157 (apple/swift-crypto#387) * apple/swift-crypto@ebcbfc6 build: Make swift-crypto build on Windows (apple/swift-crypto#385) * apple/swift-crypto@785709b Fix broken Windows tests (apple/swift-crypto#350) (apple/swift-crypto#386)
1 parent 860f398 commit 3fd9f11

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

utils/build.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2982,6 +2982,8 @@ function Build-Crypto([Hashtable] $Platform) {
29822982
-Defines @{
29832983
BUILD_SHARED_LIBS = "NO";
29842984
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2985+
CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL = "";
2986+
SwiftASN1_DIR = (Get-ProjectCMakeModules $Platform ASN1);
29852987
}
29862988
}
29872989

@@ -3547,6 +3549,7 @@ if (-not $SkipBuild) {
35473549
Invoke-BuildStep Build-LLBuild $HostPlatform
35483550
Invoke-BuildStep Build-ArgumentParser $HostPlatform
35493551
Invoke-BuildStep Build-Driver $HostPlatform
3552+
Invoke-BuildStep Build-ASN1 $HostPlatform
35503553
Invoke-BuildStep Build-Crypto $HostPlatform
35513554
Invoke-BuildStep Build-Collections $HostPlatform
35523555
Invoke-BuildStep Build-ASN1 $HostPlatform

utils/update_checkout/update-checkout-config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"swift-argument-parser": "1.5.1",
141141
"swift-atomics": "1.2.0",
142142
"swift-collections": "1.1.5",
143-
"swift-crypto": "3.12.3",
143+
"swift-crypto": "3.12.5",
144144
"swift-certificates": "1.10.1",
145145
"swift-asn1": "1.3.2",
146146
"swift-async-algorithms": "1.0.1",
@@ -457,7 +457,7 @@
457457
"swift-argument-parser": "1.4.0",
458458
"swift-atomics": "1.2.0",
459459
"swift-collections": "1.1.5",
460-
"swift-crypto": "3.12.3",
460+
"swift-crypto": "3.12.5",
461461
"swift-certificates": "1.10.1",
462462
"swift-asn1": "1.3.2",
463463
"swift-async-algorithms": "1.0.1",
@@ -515,7 +515,7 @@
515515
"swift-async-algorithms": "1.0.1",
516516
"swift-atomics": "1.2.0",
517517
"swift-collections": "1.1.5",
518-
"swift-crypto": "3.12.3",
518+
"swift-crypto": "3.12.5",
519519
"swift-certificates": "1.10.1",
520520
"swift-asn1": "1.3.2",
521521
"swift-driver": "main",

0 commit comments

Comments
 (0)