diff --git a/Sources/SwiftBuildSupport/PackagePIFBuilder.swift b/Sources/SwiftBuildSupport/PackagePIFBuilder.swift
index 65b303f68b4..a65f42e7879 100644
--- a/Sources/SwiftBuildSupport/PackagePIFBuilder.swift
+++ b/Sources/SwiftBuildSupport/PackagePIFBuilder.swift
@@ -358,7 +358,7 @@ public final class PackagePIFBuilder {
         // Products.
         case application
         case staticArchive
-        case objectFile
+        case commonObject
         case dynamicLibrary
         case framework
         case executable
@@ -382,7 +382,7 @@ public final class PackagePIFBuilder {
             self = switch pifProductType {
             case .application: .application
             case .staticArchive: .staticArchive
-            case .objectFile: .objectFile
+            case .commonObject: .commonObject
             case .dynamicLibrary: .dynamicLibrary
             case .framework: .framework
             case .executable: .executable
diff --git a/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift b/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift
index 55d7fe227dc..c2769c70b19 100644
--- a/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift
+++ b/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift
@@ -249,11 +249,7 @@ extension PackagePIFProjectBuilder {
             }
 
         case .staticLibrary, .executable:
-            #if os(Windows) // Temporary until we get a new productType in swift-build
-            productType = .staticArchive
-            #else
-            productType = .objectFile
-            #endif
+            productType = .commonObject
 
         case .macro:
             productType = .hostBuildTool