Skip to content

[Unix] Use the new -sysroot flag for all non-Darwin Unix platforms, not just Android (#1811) #1819

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 1 commit into from
Feb 27, 2025
Merged

[Unix] Use the new -sysroot flag for all non-Darwin Unix platforms, not just Android (#1811) #1819

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
16 changes: 8 additions & 8 deletions Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,14 @@ extension GenericUnixToolchain {
commandLine.appendPath(try VirtualPath(path: opt.argument.asSingle))
}

if targetTriple.environment == .android {
if let sysroot = parsedOptions.getLastArgument(.sysroot)?.asSingle {
commandLine.appendFlag("--sysroot")
try commandLine.appendPath(VirtualPath(path: sysroot))
} else if let sysroot = AndroidNDK.getDefaultSysrootPath(in: self.env) {
commandLine.appendFlag("--sysroot")
try commandLine.appendPath(VirtualPath(path: sysroot.pathString))
}
if let sysroot = parsedOptions.getLastArgument(.sysroot)?.asSingle {
commandLine.appendFlag("--sysroot")
try commandLine.appendPath(VirtualPath(path: sysroot))
} else if targetTriple.environment == .android,
let sysroot = AndroidNDK.getDefaultSysrootPath(in: self.env)
{
commandLine.appendFlag("--sysroot")
try commandLine.appendPath(VirtualPath(path: sysroot.pathString))
} else if let path = targetInfo.sdkPath?.path {
commandLine.appendFlag("--sysroot")
commandLine.appendPath(VirtualPath.lookup(path))
Expand Down
16 changes: 8 additions & 8 deletions Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ public final class GenericUnixToolchain: Toolchain {
frontendTargetInfo: FrontendTargetInfo,
driver: inout Driver
) throws {
if driver.targetTriple.environment == .android {
if let sysroot = driver.parsedOptions.getLastArgument(.sysroot)?.asSingle {
commandLine.appendFlag("-sysroot")
try commandLine.appendPath(VirtualPath(path: sysroot))
} else if let sysroot = AndroidNDK.getDefaultSysrootPath(in: self.env) {
commandLine.appendFlag("-sysroot")
try commandLine.appendPath(VirtualPath(path: sysroot.pathString))
}
if let sysroot = driver.parsedOptions.getLastArgument(.sysroot)?.asSingle {
commandLine.appendFlag("-sysroot")
try commandLine.appendPath(VirtualPath(path: sysroot))
} else if driver.targetTriple.environment == .android,
let sysroot = AndroidNDK.getDefaultSysrootPath(in: self.env)
{
commandLine.appendFlag("-sysroot")
try commandLine.appendPath(VirtualPath(path: sysroot.pathString))
}
}
}
2 changes: 1 addition & 1 deletion Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8149,7 +8149,7 @@ final class SwiftDriverTests: XCTestCase {
do {
let sysroot = path.appending(component: "sysroot")
var driver = try Driver(args: [
"swiftc", "-target", "aarch64-unknown-linux-android", "-sysroot", sysroot.pathString, #file
"swiftc", "-target", "aarch64-unknown-linux-gnu", "-sysroot", sysroot.pathString, #file
], env: env)
let jobs = try driver.planBuild().removingAutolinkExtractJobs()
let frontend = try XCTUnwrap(jobs.first)
Expand Down