about summary refs log tree commit diff
path: root/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch')
-rw-r--r--pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch b/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch
deleted file mode 100644
index 6c9c21cfb98e..000000000000
--- a/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Swiftpm looks for the Swift stdlib relative to the swift compiler, but that's a
-wrapper in our case. It wants to add the stdlib to the rpath, which is
-necessary for back-deployment of some features.
-
---- a/Sources/PackageModel/Toolchain.swift
-+++ b/Sources/PackageModel/Toolchain.swift
-@@ -53,12 +53,18 @@ extension Toolchain {
- 
-     public var macosSwiftStdlib: AbsolutePath {
-         get throws {
-+            if swiftCompilerPath.pathString.starts(with: "@storeDir@") {
-+                return AbsolutePath("@swiftLib@/lib/swift/macosx")
-+            }
-             return try AbsolutePath(validating: "../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath))
-         }
-     }
- 
-     public var toolchainLibDir: AbsolutePath {
-         get throws {
-+            if swiftCompilerPath.pathString.starts(with: "@storeDir@") {
-+                return AbsolutePath("@swiftLib@/lib")
-+            }
-             // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary.
-             return try AbsolutePath(validating: "../../lib", relativeTo: resolveSymlinks(swiftCompilerPath))
-         }