Skip to content

SwiftDriver: always pass -sysroot flag if specified #2120

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
compnerd merged 1 commit into from
May 1, 2026
Merged

SwiftDriver: always pass -sysroot flag if specified #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 0 deletions Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@ extension Driver {
try addPathOption(option: .sdk, path: VirtualPath.lookup(sdkPath), to: &commandLine, remap: jobNeedPathRemap)
}

if let sysroot = parsedOptions.getLastArgument(.sysroot)?.asSingle {
commandLine.appendFlag(.sysroot)
try commandLine.appendPath(VirtualPath(path: sysroot))
}

for args: (Option, Option) in [
(.visualcToolsRoot, .visualcToolsVersion),
(.windowsSdkRoot, .windowsSdkVersion)
Expand Down
5 changes: 0 additions & 5 deletions Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@ public final class GenericUnixToolchain: Toolchain {
driver: inout Driver,
skipMacroOptions: Bool
) throws {
if let sysroot = driver.parsedOptions.getLastArgument(.sysroot)?.asSingle {
commandLine.appendFlag("-sysroot")
try commandLine.appendPath(VirtualPath(path: sysroot))
}

if driver.targetTriple.os == .openbsd && driver.targetTriple.arch == .aarch64 {
if frontendTargetInfo.target.openbsdBTCFIEnabled ?? false {
commandLine.appendFlag(.Xcc)
Expand Down
20 changes: 20 additions & 0 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9397,6 +9397,26 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertJobInvocationMatches(jobs[0], .flag("-autolink-library"), .flag("oldnames"), .flag("-autolink-library"), .flag("libcmtd"), .flag("-Xcc"), .flag("-D_MT"))
}
}

func testSysRootHandling() throws {
do {
var driver = try Driver(args: ["swiftc", "-sysroot", "/path/to/sysroot", "-c", "input.swift"])
let jobs = try driver.planBuild()

XCTAssertEqual(jobs.count, 1)
XCTAssertEqual(jobs[0].kind, .compile)
XCTAssertJobInvocationMatches(jobs[0], .flag("-sysroot"), try .path(.absolute(.init(validating: "/path/to/sysroot"))))
}

do {
var driver = try Driver(args: ["swiftc", "-sdk", "/path/to/sdk", "-sysroot", "/path/to/sysroot", "-c", "input.swift"])
let jobs = try driver.planBuild()

XCTAssertEqual(jobs.count, 1)
XCTAssertEqual(jobs[0].kind, .compile)
XCTAssertJobInvocationMatches(jobs[0], .flag("-sysroot"), try .path(.absolute(.init(validating: "/path/to/sysroot"))))
}
}
}

func assertString(
Expand Down
Loading