@@ -87,29 +87,31 @@ public final class SwiftPMWorkspace {
87
87
88
88
let buildPath : AbsolutePath = buildSetup. path ?? packageRoot. appending ( component: " .build " )
89
89
90
+ let workspaceConfiguration = try Workspace . Configuration ( path: packageRoot. appending ( components: " .swiftpm " , " config " ) , fs: fileSystem)
91
+
90
92
self . workspace = Workspace (
91
93
dataPath: buildPath,
92
94
editablesPath: packageRoot. appending ( component: " Packages " ) ,
93
95
pinsFile: packageRoot. appending ( component: " Package.resolved " ) ,
94
96
manifestLoader: ManifestLoader ( manifestResources: toolchain. manifestResources, cacheDir: buildPath) ,
95
97
delegate: BuildSettingProviderWorkspaceDelegate ( ) ,
96
- config : SwiftPMConfig ( path : packageRoot . appending ( components : " .swiftpm " , " config " ) , fs : fileSystem ) ,
98
+ config: workspaceConfiguration ,
97
99
fileSystem: fileSystem,
98
100
skipUpdate: true )
99
101
100
102
let triple = toolchain. triple
101
103
102
- let swiftPMConfiguration : PackageModel . BuildConfiguration
104
+ let buildConfiguration : PackageModel . BuildConfiguration
103
105
switch buildSetup. configuration {
104
106
case . debug:
105
- swiftPMConfiguration = . debug
107
+ buildConfiguration = . debug
106
108
case . release:
107
- swiftPMConfiguration = . release
109
+ buildConfiguration = . release
108
110
}
109
111
110
112
self . buildParameters = BuildParameters (
111
113
dataPath: buildPath. appending ( component: triple. tripleString) ,
112
- configuration: swiftPMConfiguration ,
114
+ configuration: buildConfiguration ,
113
115
toolchain: toolchain,
114
116
flags: buildSetup. flags)
115
117
0 commit comments