Skip to content

Commit fa88da6

Browse files
authored
Merge pull request swiftlang#83263 from Steelskin/fabrice/swift-cryto-update-3-12-5
build: Update swift-crypto 3.12.3 -> 3.12.5
2 parents ea6ca2b + ea0097c commit fa88da6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

utils/build.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2976,12 +2976,13 @@ function Build-Crypto([Hashtable] $Platform) {
29762976
-Src $SourceCache\swift-crypto `
29772977
-Bin (Get-ProjectBinaryCache $Platform Crypto) `
29782978
-Platform $Platform `
2979-
-UseBuiltCompilers Swift `
2979+
-UseBuiltCompilers ASM, C, CXX, Swift `
29802980
-SwiftSDK (Get-SwiftSDK Windows) `
29812981
-BuildTargets default `
29822982
-Defines @{
29832983
BUILD_SHARED_LIBS = "NO";
29842984
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2985+
SwiftASN1_DIR = (Get-ProjectCMakeModules $Platform ASN1);
29852986
}
29862987
}
29872988

@@ -3547,9 +3548,9 @@ if (-not $SkipBuild) {
35473548
Invoke-BuildStep Build-LLBuild $HostPlatform
35483549
Invoke-BuildStep Build-ArgumentParser $HostPlatform
35493550
Invoke-BuildStep Build-Driver $HostPlatform
3551+
Invoke-BuildStep Build-ASN1 $HostPlatform
35503552
Invoke-BuildStep Build-Crypto $HostPlatform
35513553
Invoke-BuildStep Build-Collections $HostPlatform
3552-
Invoke-BuildStep Build-ASN1 $HostPlatform
35533554
Invoke-BuildStep Build-Certificates $HostPlatform
35543555
Invoke-BuildStep Build-System $HostPlatform
35553556
Invoke-BuildStep Build-Build $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)