Revert "Add build setting for enabling the builtin module (#6311)"

This reverts commit 4006737.

Author: Azoy

Sources/PackageDescription/BuildSettings.swift

@@ -387,12 +387,6 @@ public struct SwiftSetting {
         return SwiftSetting(
           name: "interoperabilityMode", value: values, condition: condition)
     }
-
-    @available(_PackageDescription, introduced: 5.9)
-    @_spi(FrontendOptions)
-    public static var enableBuiltinModule: SwiftSetting {
-        SwiftSetting(name: "enableBuiltinModule", value: [], condition: nil)
-    }
 }
 
 /// A linker build setting.

Sources/PackageLoading/ManifestJSONParser.swift

@@ -704,8 +704,6 @@ extension TargetBuildSettingDescription.Kind {
             return .enableExperimentalFeature(value)
         case "unsafeFlags":
             return .unsafeFlags(values)
-        case "enableBuiltinModule":
-            return .enableBuiltinModule
         default:
             throw InternalError("invalid build setting \(name)")
         }

Sources/PackageLoading/PackageBuilder.swift

@@ -1059,18 +1059,6 @@ public final class PackageBuilder {
                 }
 
                 values = ["-enable-experimental-feature", value]
-
-            case .enableBuiltinModule:
-                switch setting.tool {
-                case .c, .cxx, .linker:
-                    throw InternalError(
-                        "only Swift supports enabling the builtin module")
-
-                case .swift:
-                    decl = .OTHER_SWIFT_FLAGS
-                }
-
-                values = ["-enable-builtin-module"]
             }
 
             // Create an assignment for this setting.

Sources/PackageModel/Manifest/TargetBuildSettingDescription.swift

@@ -40,14 +40,12 @@ public enum TargetBuildSettingDescription {
 
         case unsafeFlags([String])
 
-        case enableBuiltinModule
-
         public var isUnsafeFlags: Bool {
             switch self {
             case .unsafeFlags(let flags):
                 // If `.unsafeFlags` is used, but doesn't specify any flags, we treat it the same way as not specifying it.
                 return !flags.isEmpty
-            case .headerSearchPath, .define, .linkedLibrary, .linkedFramework, .interoperabilityMode, .enableUpcomingFeature, .enableExperimentalFeature, .enableBuiltinModule:
+            case .headerSearchPath, .define, .linkedLibrary, .linkedFramework, .interoperabilityMode, .enableUpcomingFeature, .enableExperimentalFeature:
                 return false
             }
         }

Sources/PackageModel/ManifestSourceGeneration.swift

@@ -526,8 +526,6 @@ fileprivate extension SourceCodeFragment {
                 params.append(SourceCodeFragment(from: condition))
             }
             self.init(enum: setting.kind.name, subnodes: params)
-        case .enableBuiltinModule:
-            self.init(enum: setting.kind.name)
         }
     }
 }
@@ -680,8 +678,6 @@ extension TargetBuildSettingDescription.Kind {
             return "enableUpcomingFeature"
         case .enableExperimentalFeature:
             return "enableExperimentalFeature"
-        case .enableBuiltinModule:
-            return "enableBuiltinModule"
         }
     }
 }

Tests/BuildTests/BuildPlanTests.swift

@@ -3245,8 +3245,7 @@ final class BuildPlanTests: XCTestCase {
                         .init(tool: .swift, kind: .interoperabilityMode(.Cxx, "swift-5.9"), condition: .init(platformNames: ["linux"])),
                         .init(tool: .swift, kind: .interoperabilityMode(.Cxx, "swift-6.0"), condition: .init(platformNames: ["macos"])),
                         .init(tool: .swift, kind: .enableUpcomingFeature("BestFeature")),
-                        .init(tool: .swift, kind: .enableUpcomingFeature("WorstFeature"), condition: .init(platformNames: ["macos"], config: "debug")),
-                        .init(tool: .swift, kind: .enableBuiltinModule)
+                        .init(tool: .swift, kind: .enableUpcomingFeature("WorstFeature"), condition: .init(platformNames: ["macos"], config: "debug"))
                     ]
                 ),
                 try TargetDescription(
@@ -3312,7 +3311,7 @@ final class BuildPlanTests: XCTestCase {
             XCTAssertMatch(cbar, [.anySequence, "-DCCC=2", "-I\(A.appending(components: "Sources", "cbar", "Sources", "headers"))", "-I\(A.appending(components: "Sources", "cbar", "Sources", "cppheaders"))", "-Icfoo", "-L", "cbar", "-Icxxfoo", "-L", "cxxbar", .end])
 
             let bar = try result.target(for: "bar").swiftTarget().compileArguments()
-            XCTAssertMatch(bar, [.anySequence, "-DLINUX", "-Isfoo", "-L", "sbar", "-cxx-interoperability-mode=swift-5.9", "-enable-upcoming-feature", "BestFeature", "-enable-builtin-module", .end])
+            XCTAssertMatch(bar, [.anySequence, "-DLINUX", "-Isfoo", "-L", "sbar", "-cxx-interoperability-mode=swift-5.9", "-enable-upcoming-feature", "BestFeature", .end])
 
             let exe = try result.target(for: "exe").swiftTarget().compileArguments()
             XCTAssertMatch(exe, [.anySequence, "-DFOO", .end])
@@ -3328,7 +3327,7 @@ final class BuildPlanTests: XCTestCase {
             XCTAssertMatch(cbar, [.anySequence, "-DCCC=2", "-I\(A.appending(components: "Sources", "cbar", "Sources", "headers"))", "-I\(A.appending(components: "Sources", "cbar", "Sources", "cppheaders"))", "-Icfoo", "-L", "cbar", "-Icxxfoo", "-L", "cxxbar", .end])
 
             let bar = try result.target(for: "bar").swiftTarget().compileArguments()
-            XCTAssertMatch(bar, [.anySequence, "-DDMACOS", "-Isfoo", "-L", "sbar", "-cxx-interoperability-mode=swift-6.0", "-enable-upcoming-feature", "BestFeature", "-enable-upcoming-feature", "WorstFeature", "-enable-builtin-module", .end])
+            XCTAssertMatch(bar, [.anySequence, "-DDMACOS", "-Isfoo", "-L", "sbar", "-cxx-interoperability-mode=swift-6.0", "-enable-upcoming-feature", "BestFeature", "-enable-upcoming-feature", "WorstFeature", .end])
 
             let exe = try result.target(for: "exe").swiftTarget().compileArguments()
             XCTAssertMatch(exe, [.anySequence, "-DFOO", .end])