@@ -546,23 +546,25 @@ public final class UserToolchain: Toolchain {
546
546
xctest. append ( contentsOf: [ " -L " , implib. parentDirectory. pathString] )
547
547
}
548
548
549
- let swiftTestingInstallation : AbsolutePath =
550
- platform. appending ( " Developer " )
551
- . appending ( " Library " )
552
- . appending ( " Testing- \( info. defaults. swiftTestingVersion) " )
553
-
554
- swiftTesting = try [
555
- " -I " ,
556
- AbsolutePath (
557
- validating: " usr/lib/swift/windows " ,
558
- relativeTo: swiftTestingInstallation
559
- ) . pathString,
560
- " -L " ,
561
- AbsolutePath (
562
- validating: " usr/lib/swift/windows/ \( triple. archName) " ,
563
- relativeTo: swiftTestingInstallation
564
- ) . pathString
565
- ]
549
+ if let swiftTestingVersion = info. defaults. swiftTestingVersion {
550
+ let swiftTestingInstallation : AbsolutePath =
551
+ platform. appending ( " Developer " )
552
+ . appending ( " Library " )
553
+ . appending ( " Testing- \( swiftTestingVersion) " )
554
+
555
+ swiftTesting = try [
556
+ " -I " ,
557
+ AbsolutePath (
558
+ validating: " usr/lib/swift/windows " ,
559
+ relativeTo: swiftTestingInstallation
560
+ ) . pathString,
561
+ " -L " ,
562
+ AbsolutePath (
563
+ validating: " usr/lib/swift/windows/ \( triple. archName) " ,
564
+ relativeTo: swiftTestingInstallation
565
+ ) . pathString
566
+ ]
567
+ }
566
568
567
569
extraSwiftCFlags = info. defaults. extraSwiftCFlags ?? [ ]
568
570
}
@@ -1019,10 +1021,14 @@ public final class UserToolchain: Toolchain {
1019
1021
return nil
1020
1022
}
1021
1023
1024
+ guard let swiftTestingVersion = info. defaults. swiftTestingVersion else {
1025
+ return nil
1026
+ }
1027
+
1022
1028
let swiftTesting : AbsolutePath =
1023
1029
platform. appending ( " Developer " )
1024
1030
. appending ( " Library " )
1025
- . appending ( " Testing- \( info . defaults . swiftTestingVersion) " )
1031
+ . appending ( " Testing- \( swiftTestingVersion) " )
1026
1032
1027
1033
let binPath : AbsolutePath ? = switch triple. arch {
1028
1034
case . x86_64: // amd64 x86_64 x86_64h
0 commit comments