1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-26 19:16:47 +03:00
nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch

41 lines
1.8 KiB
Diff
Raw Normal View History

2022-08-26 08:09:17 +02:00
--- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
+++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
2023-04-01 21:43:12 +02:00
@@ -10,6 +10,7 @@
2022-08-26 08:09:17 +02:00
//
//===----------------------------------------------------------------------===//
2023-04-01 21:43:12 +02:00
2022-08-26 08:09:17 +02:00
+import Foundation
import SwiftOptions
2023-04-01 21:43:12 +02:00
import func TSCBasic.lookupExecutablePath
@@ -120,7 +121,20 @@ extension GenericUnixToolchain {
2022-08-26 08:09:17 +02:00
// just using `clang` and avoid a dependency on the C++ runtime.
let clangTool: Tool =
parsedOptions.hasArgument(.enableExperimentalCxxInterop) ? .clangxx : .clang
- var clangPath = try getToolPath(clangTool)
+
+ // For Nix, prefer linking using the wrapped system clang, instead of using
+ // the unwrapped clang packaged with swift. The latter is unable to link, but
+ // we still want to use it for other purposes (clang importer).
+ var clangPath: AbsolutePath
+ let env = ProcessInfo.processInfo.environment
+ if let nixCC = env["NIX_CC"],
+ let binPath = try? AbsolutePath(validating: "\(nixCC)/bin"),
+ let tool = lookupExecutablePath(filename: parsedOptions.hasArgument(.enableExperimentalCxxInterop)
+ ? "clang++" : "clang",
+ searchPaths: [binPath]) {
+ clangPath = tool
+ } else {
+ clangPath = try getToolPath(clangTool)
if let toolsDirPath = parsedOptions.getLastArgument(.toolsDirectory) {
// FIXME: What if this isn't an absolute path?
let toolsDir = try AbsolutePath(validating: toolsDirPath.asSingle)
2023-04-01 21:43:12 +02:00
@@ -136,6 +150,7 @@ extension GenericUnixToolchain {
2022-08-26 08:09:17 +02:00
commandLine.appendFlag("-B")
commandLine.appendPath(toolsDir)
}
+ } // nixCC
// Executables on Linux get -pie
if targetTriple.os == .linux && linkerOutputType == .executable {