File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -432,6 +432,12 @@ public final class UserToolchain: Toolchain {
432
432
433
433
let applicationPath = destination. binDir
434
434
435
+ // this is the normal case when using the toolchain
436
+ let librariesPath = applicationPath. parentDirectory. appending ( components: " lib " , " swift " , " pm " )
437
+ if localFileSystem. exists ( librariesPath) {
438
+ return . init( root: librariesPath)
439
+ }
440
+
435
441
// this tests if we are debugging / testing SwiftPM with Xcode
436
442
let manifestFrameworksPath = applicationPath. appending ( components: " PackageFrameworks " , " PackageDescription.framework " )
437
443
let pluginFrameworksPath = applicationPath. appending ( components: " PackageFrameworks " , " PackagePlugin.framework " )
@@ -450,12 +456,6 @@ public final class UserToolchain: Toolchain {
450
456
)
451
457
}
452
458
453
- // this tests if we are debugging / testing SwiftPM with CMake / bootstrap
454
- let cmakeLibrariesPath = applicationPath. parentDirectory. appending ( components: " lib " , " swift " , " pm " )
455
- if localFileSystem. exists ( cmakeLibrariesPath) {
456
- return . init( root: cmakeLibrariesPath)
457
- }
458
-
459
459
// default case - no custom location which will use the one from the toolchain
460
460
return nil
461
461
}
You can’t perform that action at this time.
0 commit comments