@@ -100,6 +100,27 @@ if ProcessInfo.processInfo.environment["SWIFTCI_INSTALL_RPATH_OS"] == "android"
100
100
*/
101
101
let autoProducts = [ swiftPMProduct, swiftPMDataModelProduct]
102
102
103
+ let shoudUseSwiftBuildFramework = ( ProcessInfo . processInfo. environment [ " SWIFTPM_SWBUILD_FRAMEWORK " ] != nil )
104
+
105
+ let swiftDriverDeps : [ Target . Dependency ]
106
+ let swiftTSCBasicsDeps : [ Target . Dependency ]
107
+ let swiftToolsCoreSupportAutoDeps : [ Target . Dependency ]
108
+
109
+ if shoudUseSwiftBuildFramework {
110
+ swiftDriverDeps = [ ]
111
+ swiftTSCBasicsDeps = [ ]
112
+ swiftToolsCoreSupportAutoDeps = [ ]
113
+ } else {
114
+ swiftDriverDeps = [
115
+ . product( name: " SwiftDriver " , package : " swift-driver " )
116
+ ]
117
+ swiftTSCBasicsDeps = [
118
+ . product( name: " TSCBasic " , package : " swift-tools-support-core " ) ,
119
+ ]
120
+ swiftToolsCoreSupportAutoDeps = [
121
+ . product( name: " SwiftToolsSupport-auto " , package : " swift-tools-support-core " )
122
+ ]
123
+ }
103
124
let package = Package (
104
125
name: " SwiftPM " ,
105
126
platforms: [
@@ -244,9 +265,8 @@ let package = Package(
244
265
. product( name: " SwiftToolchainCSQLite " , package : " swift-toolchain-sqlite " , condition: . when( platforms: [ . windows, . android] ) ) ,
245
266
. product( name: " DequeModule " , package : " swift-collections " ) ,
246
267
. product( name: " OrderedCollections " , package : " swift-collections " ) ,
247
- . product( name: " SwiftToolsSupport-auto " , package : " swift-tools-support-core " ) ,
248
268
. product( name: " SystemPackage " , package : " swift-system " ) ,
249
- ] ,
269
+ ] + swiftToolsCoreSupportAutoDeps ,
250
270
exclude: [ " CMakeLists.txt " , " Vendor/README.md " ] ,
251
271
swiftSettings: swift6CompatibleExperimentalFeatures + [
252
272
. enableExperimentalFeature( " StrictConcurrency " ) ,
@@ -309,8 +329,7 @@ let package = Package(
309
329
name: " SwiftFixIt " ,
310
330
dependencies: [
311
331
" Basics " ,
312
- . product( name: " TSCBasic " , package : " swift-tools-support-core " ) ,
313
- ] + swiftSyntaxDependencies(
332
+ ] + swiftTSCBasicsDeps + swiftSyntaxDependencies(
314
333
[ " SwiftDiagnostics " , " SwiftIDEUtils " , " SwiftParser " , " SwiftSyntax " ]
315
334
) ,
316
335
exclude: [ " CMakeLists.txt " ] ,
@@ -474,10 +493,9 @@ let package = Package(
474
493
" PackageGraph " ,
475
494
" SPMBuildCore " ,
476
495
" SPMLLBuild " ,
477
- . product( name: " SwiftDriver " , package : " swift-driver " ) ,
478
496
. product( name: " OrderedCollections " , package : " swift-collections " ) ,
479
497
" DriverSupport " ,
480
- ] ,
498
+ ] + swiftDriverDeps ,
481
499
exclude: [ " CMakeLists.txt " ] ,
482
500
swiftSettings: commonExperimentalFeatures + [
483
501
. unsafeFlags( [ " -static " ] ) ,
@@ -488,8 +506,7 @@ let package = Package(
488
506
dependencies: [
489
507
" Basics " ,
490
508
" PackageModel " ,
491
- . product( name: " SwiftDriver " , package : " swift-driver " ) ,
492
- ] ,
509
+ ] + swiftDriverDeps,
493
510
exclude: [ " CMakeLists.txt " ] ,
494
511
swiftSettings: commonExperimentalFeatures + [
495
512
. unsafeFlags( [ " -static " ] ) ,
@@ -1095,7 +1112,7 @@ if ProcessInfo.processInfo.environment["ENABLE_APPLE_PRODUCT_TYPES"] == "1" {
1095
1112
}
1096
1113
}
1097
1114
1098
- if ProcessInfo . processInfo . environment [ " SWIFTPM_SWBUILD_FRAMEWORK " ] == nil {
1115
+ if !shoudUseSwiftBuildFramework {
1099
1116
1100
1117
let swiftbuildsupport : Target = package . targets. first ( where: { $0. name == " SwiftBuildSupport " } ) !
1101
1118
swiftbuildsupport. dependencies += [
0 commit comments