diff options
Diffstat (limited to 'pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch')
| -rw-r--r-- | pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch | 121 |
1 files changed, 0 insertions, 121 deletions
diff --git a/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch b/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch deleted file mode 100644 index 93c43c664ed3..000000000000 --- a/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch +++ /dev/null @@ -1,121 +0,0 @@ -Swiftpm may invoke clang, not clang++, to compile C++. Our cc-wrapper also -doesn't pick up the arguments that enable C++ compilation in this case. Patch -swiftpm to properly invoke clang++. - ---- a/Sources/Build/BuildPlan.swift -+++ b/Sources/Build/BuildPlan.swift -@@ -2089,7 +2089,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan { - for target in dependencies.staticTargets { - if case let target as ClangTarget = target.underlyingTarget, target.isCXX { - if buildParameters.hostTriple.isDarwin() { -- buildProduct.additionalFlags += ["-lc++"] -+ buildProduct.additionalFlags += ["-lc++", "-lc++abi"] - } else if buildParameters.hostTriple.isWindows() { - // Don't link any C++ library. - } else { ---- a/Sources/Build/LLBuildManifestBuilder.swift -+++ b/Sources/Build/LLBuildManifestBuilder.swift -@@ -786,7 +786,7 @@ extension LLBuildManifestBuilder { - - args += ["-c", path.source.pathString, "-o", path.object.pathString] - -- let clangCompiler = try buildParameters.toolchain.getClangCompiler().pathString -+ let clangCompiler = try buildParameters.toolchain.getClangCompiler(isCXX: isCXX).pathString - args.insert(clangCompiler, at: 0) - - let objectFileNode: Node = .file(path.object) ---- a/Sources/PackageModel/Toolchain.swift -+++ b/Sources/PackageModel/Toolchain.swift -@@ -23,7 +23,7 @@ public protocol Toolchain { - var macosSwiftStdlib: AbsolutePath { get throws } - - /// Path of the `clang` compiler. -- func getClangCompiler() throws -> AbsolutePath -+ func getClangCompiler(isCXX: Bool) throws -> AbsolutePath - - // FIXME: This is a temporary API until index store is widely available in - // the OSS clang compiler. This API should not used for any other purpose. ---- a/Sources/PackageModel/UserToolchain.swift -+++ b/Sources/PackageModel/UserToolchain.swift -@@ -57,7 +57,7 @@ public final class UserToolchain: Toolchain { - /// Only use search paths, do not fall back to `xcrun`. - let useXcrun: Bool - -- private var _clangCompiler: AbsolutePath? -+ private var _clangCompiler: [Bool: AbsolutePath] = [:] - - private let environment: EnvironmentVariables - -@@ -196,29 +196,31 @@ public final class UserToolchain: Toolchain { - } - - /// Returns the path to clang compiler tool. -- public func getClangCompiler() throws -> AbsolutePath { -+ public func getClangCompiler(isCXX: Bool) throws -> AbsolutePath { - // Check if we already computed. -- if let clang = self._clangCompiler { -+ if let clang = self._clangCompiler[isCXX] { - return clang - } - - // Check in the environment variable first. -- if let toolPath = UserToolchain.lookup(variable: "CC", searchPaths: self.envSearchPaths, environment: environment) { -- self._clangCompiler = toolPath -+ let envVar = isCXX ? "CXX" : "CC"; -+ if let toolPath = UserToolchain.lookup(variable: envVar, searchPaths: self.envSearchPaths, environment: environment) { -+ self._clangCompiler[isCXX] = toolPath - return toolPath - } - - // Then, check the toolchain. -+ let tool = isCXX ? "clang++" : "clang"; - do { -- if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.toolchainBinDir) { -- self._clangCompiler = toolPath -+ if let toolPath = try? UserToolchain.getTool(tool, binDir: self.destination.binDir) { -+ self._clangCompiler[isCXX] = toolPath - return toolPath - } - } - - // Otherwise, lookup it up on the system. -- let toolPath = try UserToolchain.findTool("clang", envSearchPaths: self.envSearchPaths, useXcrun: useXcrun) -- self._clangCompiler = toolPath -+ let toolPath = try UserToolchain.findTool(tool, envSearchPaths: self.envSearchPaths, useXcrun: useXcrun) -+ self._clangCompiler[isCXX] = toolPath - return toolPath - } - ---- a/Sources/SPMBuildCore/BuildParameters.swift -+++ b/Sources/SPMBuildCore/BuildParameters.swift -@@ -394,7 +394,7 @@ private struct _Toolchain: Encodable { - public func encode(to encoder: Encoder) throws { - var container = encoder.container(keyedBy: CodingKeys.self) - try container.encode(toolchain.swiftCompilerPath, forKey: .swiftCompiler) -- try container.encode(toolchain.getClangCompiler(), forKey: .clangCompiler) -+ try container.encode(toolchain.getClangCompiler(isCXX: false), forKey: .clangCompiler) - - try container.encode(toolchain.extraFlags.cCompilerFlags, forKey: .extraCCFlags) - // Maintaining `extraCPPFlags` key for compatibility with older encoding. ---- a/Sources/XCBuildSupport/XcodeBuildSystem.swift -+++ b/Sources/XCBuildSupport/XcodeBuildSystem.swift -@@ -182,7 +182,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem { - // Generate a table of any overriding build settings. - var settings: [String: String] = [:] - // An error with determining the override should not be fatal here. -- settings["CC"] = try? buildParameters.toolchain.getClangCompiler().pathString -+ settings["CC"] = try? buildParameters.toolchain.getClangCompiler(isCXX: false).pathString - // Always specify the path of the effective Swift compiler, which was determined in the same way as for the native build system. - settings["SWIFT_EXEC"] = buildParameters.toolchain.swiftCompilerPath.pathString - settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(try buildParameters.toolchain.toolchainLibDir.pathString)" ---- a/Tests/BuildTests/MockBuildTestHelper.swift -+++ b/Tests/BuildTests/MockBuildTestHelper.swift -@@ -23,7 +23,7 @@ struct MockToolchain: PackageModel.Toolchain { - #else - let extraFlags = BuildFlags(cxxCompilerFlags: ["-lstdc++"]) - #endif -- func getClangCompiler() throws -> AbsolutePath { -+ func getClangCompiler(isCXX: Bool) throws -> AbsolutePath { - return AbsolutePath(path: "/fake/path/to/clang") - } - |