File tree Expand file tree Collapse file tree 3 files changed +2
-21
lines changed Expand file tree Collapse file tree 3 files changed +2
-21
lines changed Original file line number Diff line number Diff line change @@ -441,16 +441,7 @@ extension ExplicitDependencyBuildPlanner {
441
441
if let previouslyHashsedName = hashedModuleNameCache [ cacheQuery] {
442
442
return previouslyHashsedName
443
443
}
444
- let hashedArguments : String
445
- #if canImport(Darwin)
446
- if #available( macOS 10 . 15 , * ) {
447
- hashedArguments = CryptoKitSHA256 ( ) . hash ( hashInput) . hexadecimalRepresentation
448
- } else {
449
- hashedArguments = SHA256 ( ) . hash ( hashInput) . hexadecimalRepresentation
450
- }
451
- #else
452
- hashedArguments = SHA256 ( ) . hash ( hashInput) . hexadecimalRepresentation
453
- #endif
444
+ let hashedArguments = SHA256 ( ) . hash ( hashInput) . hexadecimalRepresentation
454
445
let resultingName = moduleName + " - " + hashedArguments
455
446
hashedModuleNameCache [ cacheQuery] = resultingName
456
447
return resultingName
Original file line number Diff line number Diff line change @@ -112,15 +112,7 @@ import SwiftOptions
112
112
. map { $0. option. spelling }
113
113
. sorted ( )
114
114
. joined ( )
115
- #if canImport(Darwin)
116
- if #available( macOS 10 . 15 , * ) {
117
- return CryptoKitSHA256 ( ) . hash ( hashInput) . hexadecimalRepresentation
118
- } else {
119
- return SHA256 ( ) . hash ( hashInput) . hexadecimalRepresentation
120
- }
121
- #else
122
115
return SHA256 ( ) . hash ( hashInput) . hexadecimalRepresentation
123
- #endif
124
116
}
125
117
126
118
/// Determine the input and output path for the build record
Original file line number Diff line number Diff line change @@ -4372,9 +4372,7 @@ final class SwiftDriverTests: XCTestCase {
4372
4372
4373
4373
func testVerboseImmediateMode( ) throws {
4374
4374
#if os(macOS) && arch(arm64)
4375
- // Temporarily disabled on Apple Silicon
4376
- // rdar://80558898
4377
- throw XCTSkip ( )
4375
+ try XCTSkipIf ( true , " Temporarily disabled on Apple Silicon (rdar://80558898) " )
4378
4376
#endif
4379
4377
4380
4378
// There is nothing particularly macOS-specific about this test other than
You can’t perform that action at this time.
0 commit comments