Luke Granger-Brown
57725ef3ec
git-subtree-dir: third_party/nixpkgs git-subtree-split: 76612b17c0ce71689921ca12d9ffdc9c23ce40b2
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
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))
|
|
}
|