Skip to content

Allow setting the clang++ environment variable #1605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2024
Merged

Allow setting the clang++ environment variable #1605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a480b4
Allow setting the clang++ environment variable
etcwilde May 13, 2024
43c1144
Test: Check clang overrides
etcwilde May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Sources/SwiftDriver/Toolchains/Toolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ extension Toolchain {

/// - Returns: String in the form of: `SWIFT_DRIVER_TOOLNAME_EXEC`
private func envVarName(for toolName: String) -> String {
let lookupName = toolName.replacingOccurrences(of: "-", with: "_").uppercased()
let lookupName = toolName
.replacingOccurrences(of: "-", with: "_")
.replacingOccurrences(of: "+", with: "X")
.uppercased()
return "SWIFT_DRIVER_\(lookupName)_EXEC"
}

Expand Down
35 changes: 35 additions & 0 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6823,6 +6823,41 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertEqual(jobs.first!.tool.name, swiftHelp.pathString)
}

func testSwiftClangOverride() throws {
var env = ProcessEnv.vars
let swiftClang = try AbsolutePath(validating: "/A/Path/swift-clang")
env["SWIFT_DRIVER_CLANG_EXEC"] = swiftClang.pathString

var driver = try Driver(
args: ["swiftc", "-emit-library", "foo.swift", "bar.o", "-o", "foo.l"],
env: env)
let jobs = try driver.planBuild()
XCTAssertEqual(jobs.count, 2)
let linkJob = jobs[1]
XCTAssertEqual(linkJob.tool.name, swiftClang.pathString)
}

func testSwiftClangxxOverride() throws {
#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
throw XCTSkip("Darwin always uses `clang` to link")
#else
var env = ProcessEnv.vars
let swiftClang = try AbsolutePath(validating: "/A/Path/swift-clang")
let swiftClangxx = try AbsolutePath(validating: "/A/Path/swift-clang++")
env["SWIFT_DRIVER_CLANG_EXEC"] = swiftClang.pathString
env["SWIFT_DRIVER_CLANGXX_EXEC"] = swiftClangxx.pathString

var driver = try Driver(
args: ["swiftc", "-cxx-interoperability-mode=swift-5.9", "-emit-library",
"foo.swift", "bar.o", "-o", "foo.l"],
env: env)

let jobs = try driver.planBuild()
let linkJob = jobs.last!
XCTAssertEqual(linkJob.tool.name, swiftClangxx.pathString)
#endif
}

func testSourceInfoFileEmitOption() throws {
// implicit
do {
Expand Down