Luke Granger-Brown
57725ef3ec
git-subtree-dir: third_party/nixpkgs git-subtree-split: 76612b17c0ce71689921ca12d9ffdc9c23ce40b2
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
Swift parses .pc files manually, but this means it bypasses our pkg-config
|
|
wrapper. That wrapper normally takes care of introducing the correct
|
|
PKG_CONFIG_PATH for cross compiling.
|
|
|
|
--- a/Sources/PackageLoading/PkgConfig.swift
|
|
+++ b/Sources/PackageLoading/PkgConfig.swift
|
|
@@ -123,14 +123,17 @@ public struct PkgConfig {
|
|
|
|
private static var envSearchPaths: [AbsolutePath] {
|
|
get throws {
|
|
- if let configPath = ProcessEnv.vars["PKG_CONFIG_PATH"] {
|
|
+ var result: [AbsolutePath] = []
|
|
+ for envVar in ["PKG_CONFIG_PATH", "PKG_CONFIG_PATH_FOR_TARGET"] {
|
|
+ if let configPath = ProcessEnv.vars[envVar] {
|
|
#if os(Windows)
|
|
- return try configPath.split(separator: ";").map({ try AbsolutePath(validating: String($0)) })
|
|
+ result += try configPath.split(separator: ";").map({ try AbsolutePath(validating: String($0)) })
|
|
#else
|
|
- return try configPath.split(separator: ":").map({ try AbsolutePath(validating: String($0)) })
|
|
+ result += try configPath.split(separator: ":").map({ try AbsolutePath(validating: String($0)) })
|
|
#endif
|
|
}
|
|
- return []
|
|
+ }
|
|
+ return result
|
|
}
|
|
}
|
|
}
|