Skip to content

Commit 4c4487b

Browse files
authored
Use new common object product type in PIF (#9216)
1 parent aa882cf commit 4c4487b

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

Sources/SwiftBuildSupport/PackagePIFBuilder.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ public final class PackagePIFBuilder {
358358
// Products.
359359
case application
360360
case staticArchive
361-
case objectFile
361+
case commonObject
362362
case dynamicLibrary
363363
case framework
364364
case executable
@@ -382,7 +382,7 @@ public final class PackagePIFBuilder {
382382
self = switch pifProductType {
383383
case .application: .application
384384
case .staticArchive: .staticArchive
385-
case .objectFile: .objectFile
385+
case .commonObject: .commonObject
386386
case .dynamicLibrary: .dynamicLibrary
387387
case .framework: .framework
388388
case .executable: .executable

Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,7 @@ extension PackagePIFProjectBuilder {
250250
}
251251

252252
case .staticLibrary, .executable:
253-
#if os(Windows) // Temporary until we get a new productType in swift-build
254-
productType = .staticArchive
255-
#else
256-
productType = .objectFile
257-
#endif
253+
productType = .commonObject
258254

259255
case .macro:
260256
productType = .hostBuildTool

0 commit comments

Comments
 (0)