Revert "Swift SDKs: implement swiftResourcesPath (#6717)"

This reverts commit 76e3594.

Author: compnerd

Sources/Build/BuildDescription/ProductBuildDescription.swift

@@ -187,7 +187,6 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
             derivedProductType = self.product.type
         }
 
-        var isLinkingStaticStdlib = false
         switch derivedProductType {
         case .macro:
             throw InternalError("macro not supported") // should never be reached
@@ -214,13 +213,11 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
             args += self.deadStripArguments
         case .executable, .snippet:
             // Link the Swift stdlib statically, if requested.
-            // TODO: unify this logic with SwiftTargetBuildDescription.stdlibArguments
             if self.buildParameters.shouldLinkStaticSwiftStdlib {
                 if self.buildParameters.targetTriple.isDarwin() {
                     self.observabilityScope.emit(.swiftBackDeployError)
                 } else if self.buildParameters.targetTriple.isSupportingStaticStdlib {
                     args += ["-static-stdlib"]
-                    isLinkingStaticStdlib = true
                 }
             }
             args += ["-emit-executable"]
@@ -246,16 +243,6 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
             throw InternalError("unexpectedly asked to generate linker arguments for a plugin product")
         }
 
-        if let resourcesPath = self.buildParameters.toolchain.swiftResourcesPath(isStatic: isLinkingStaticStdlib) {
-            args += ["-resource-dir", "\(resourcesPath)"]
-        }
-
-        // clang resources are always in lib/swift/
-        if let dynamicResourcesPath = self.buildParameters.toolchain.swiftResourcesPath {
-            let clangResourcesPath = dynamicResourcesPath.appending("clang")
-            args += ["-Xclang-linker", "-resource-dir", "-Xclang-linker", "\(clangResourcesPath)"]
-        }
-
         // Set rpath such that dynamic libraries are looked up
         // adjacent to the product.
         if self.buildParameters.targetTriple.isLinux() {

Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift

@@ -830,18 +830,12 @@ public final class SwiftTargetBuildDescription {
     }
 
     private var stdlibArguments: [String] {
-        var arguments: [String] = []
-
-        let isLinkingStaticStdlib = self.buildParameters.shouldLinkStaticSwiftStdlib
-            && self.buildParameters.targetTriple.isSupportingStaticStdlib
-        if isLinkingStaticStdlib {
-            arguments += ["-static-stdlib"]
-        }
-
-        if let resourcesPath = self.buildParameters.toolchain.swiftResourcesPath(isStatic: isLinkingStaticStdlib) {
-            arguments += ["-resource-dir", "\(resourcesPath)"]
+        if self.buildParameters.shouldLinkStaticSwiftStdlib,
+           self.buildParameters.targetTriple.isSupportingStaticStdlib
+        {
+            return ["-static-stdlib"]
+        } else {
+            return []
         }
-
-        return arguments
     }
 }

Sources/PackageModel/Toolchain.swift

@@ -19,12 +19,6 @@ public protocol Toolchain {
     /// Path of the `swiftc` compiler.
     var swiftCompilerPath: AbsolutePath { get }
 
-    /// Path to `lib/swift`
-    var swiftResourcesPath: AbsolutePath? { get }
-
-    /// Path to `lib/swift_static`
-    var swiftStaticResourcesPath: AbsolutePath? { get }
-
     /// Whether the used compiler is from a open source development toolchain.
     var isSwiftDevelopmentToolchain: Bool { get }
 
@@ -87,15 +81,7 @@ extension Toolchain {
             return try AbsolutePath(validating: "../../lib", relativeTo: resolveSymlinks(swiftCompilerPath))
         }
     }
-
-    /// Returns the appropriate Swift resources directory path.
-    ///
-    /// - Parameter static: Controls whether to use the static or dynamic
-    /// resources directory.
-    public func swiftResourcesPath(isStatic: Bool) -> AbsolutePath? {
-        isStatic ? swiftStaticResourcesPath : swiftResourcesPath
-    }
-
+    
     public var extraCCFlags: [String] {
         extraFlags.cCompilerFlags
     }

Sources/PackageModel/UserToolchain.swift

@@ -40,16 +40,6 @@ public final class UserToolchain: Toolchain {
     /// An array of paths to search for libraries at link time.
     public let librarySearchPaths: [AbsolutePath]
 
-    /// Path containing Swift resources for dynamic linking.
-    public var swiftResourcesPath: AbsolutePath? {
-        destination.pathsConfiguration.swiftResourcesPath
-    }
-
-    /// Path containing Swift resources for static linking.
-    public var swiftStaticResourcesPath: AbsolutePath? {
-        destination.pathsConfiguration.swiftStaticResourcesPath
-    }
-
     /// Additional flags to be passed to the build tools.
     public var extraFlags: BuildFlags
 

Tests/BuildTests/BuildPlanTests.swift

@@ -3575,9 +3575,6 @@ final class BuildPlanTests: XCTestCase {
                 Manifest.createRootManifest(
                     displayName: "Pkg",
                     path: "/Pkg",
-                    products: [
-                        ProductDescription(name: "exe", type: .executable, targets: ["exe"]),
-                    ],
                     targets: [
                         TargetDescription(name: "exe", dependencies: ["lib"]),
                         TargetDescription(name: "lib", dependencies: []),
@@ -3595,11 +3592,7 @@ final class BuildPlanTests: XCTestCase {
                 ],
                 rootPaths: try UserToolchain.default.swiftSDK.toolset.rootPaths
             ),
-            pathsConfiguration: .init(
-                sdkRootPath: "/fake/sdk",
-                swiftResourcesPath: "/fake/lib/swift",
-                swiftStaticResourcesPath: "/fake/lib/swift_static"
-            )
+            pathsConfiguration: .init(sdkRootPath: "/fake/sdk")
         )
         let mockToolchain = try UserToolchain(swiftSDK: userSwiftSDK)
         let extraBuildParameters = mockBuildParameters(toolchain: mockToolchain,
@@ -3628,7 +3621,6 @@ final class BuildPlanTests: XCTestCase {
         let exe = try result.target(for: "exe").swiftTarget().compileArguments()
         XCTAssertMatch(exe, [
             "-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
-            "-resource-dir", "/fake/lib/swift",
             .anySequence,
             "-swift-flag-from-json",
             .anySequence,
@@ -3638,29 +3630,6 @@ final class BuildPlanTests: XCTestCase {
             .anySequence,
             "-Xcc", "-clang-command-line-flag"
         ])
-
-        let exeProduct = try result.buildProduct(for: "exe").linkArguments()
-        XCTAssertMatch(exeProduct, [.anySequence, "-resource-dir", "/fake/lib/swift", "-Xclang-linker", "-resource-dir", "-Xclang-linker", "/fake/lib/swift/clang", .anySequence])
-
-        let staticBuildParameters = {
-            var copy = extraBuildParameters
-            copy.shouldLinkStaticSwiftStdlib = true
-            // pick a triple with support for static linking
-            copy.targetTriple = .x86_64Linux
-            return copy
-        }()
-        let staticResult = try BuildPlanResult(plan: BuildPlan(
-            buildParameters: staticBuildParameters,
-            graph: graph,
-            fileSystem: fs,
-            observabilityScope: observability.topScope
-        ))
-
-        let staticExe = try staticResult.target(for: "exe").swiftTarget().compileArguments()
-        XCTAssertMatch(staticExe, [.anySequence, "-resource-dir", "/fake/lib/swift_static", .anySequence])
-
-        let staticExeProduct = try staticResult.buildProduct(for: "exe").linkArguments()
-        XCTAssertMatch(staticExeProduct, [.anySequence, "-resource-dir", "/fake/lib/swift_static", "-Xclang-linker", "-resource-dir", "-Xclang-linker", "/fake/lib/swift/clang", .anySequence])
     }
 
     func testUserToolchainWithToolsetCompileFlags() throws {

Tests/BuildTests/MockBuildTestHelper.swift

@@ -28,8 +28,6 @@ struct MockToolchain: PackageModel.Toolchain {
     let swiftCompilerPath = AbsolutePath("/fake/path/to/swiftc")
     let includeSearchPaths = [AbsolutePath]()
     let librarySearchPaths = [AbsolutePath]()
-    let swiftResourcesPath: AbsolutePath? = nil
-    let swiftStaticResourcesPath: AbsolutePath? = nil
     let isSwiftDevelopmentToolchain = false
     let swiftPluginServerPath: AbsolutePath? = nil
     let extraFlags = PackageModel.BuildFlags()