Skip to content

Do not add -sysroot flag when ANDROID_NDK_ROOT environment is set #1879

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Do not add -sysroot flag when ANDROID_NDK_ROOT environment is set #1879

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: 0 additions & 5 deletions Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,6 @@ extension GenericUnixToolchain {
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
18 changes: 0 additions & 18 deletions Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,6 @@ internal enum AndroidNDK {
"darwin"
#else
nil
#endif
}

internal static func getDefaultSysrootPath(in env: [String:String]) -> AbsolutePath? {
// The NDK is only available on an x86_64 hosts currently.
#if arch(x86_64)
guard let ndk = env["ANDROID_NDK_ROOT"], let os = getOSName() else { return nil }
return try? AbsolutePath(validating: ndk)
.appending(components: "toolchains", "llvm", "prebuilt")
.appending(component: "\(os)-x86_64")
.appending(component: "sysroot")
#else
return nil
#endif
}
}
Expand Down Expand Up @@ -156,11 +143,6 @@ public final class GenericUnixToolchain: Toolchain {
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))
}

if driver.targetTriple.os == .openbsd && driver.targetTriple.arch == .aarch64 {
Expand Down
55 changes: 0 additions & 55 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8005,61 +8005,6 @@ final class SwiftDriverTests: XCTestCase {
}
}

func testAndroidNDK() throws {
try withTemporaryDirectory { path in
var env = ProcessEnv.vars
env["SWIFT_DRIVER_SWIFT_AUTOLINK_EXTRACT_EXEC"] = "/garbage/swift-autolink-extract"

do {
let sysroot = path.appending(component: "sysroot")
var driver = try Driver(args: [
"swiftc", "-target", "aarch64-unknown-linux-gnu", "-sysroot", sysroot.pathString, #file
], env: env)
let jobs = try driver.planBuild().removingAutolinkExtractJobs()
let frontend = try XCTUnwrap(jobs.first)
XCTAssertJobInvocationMatches(frontend, .flag("-sysroot"), .path(.absolute(sysroot)))
}

do {
var env = env
env["ANDROID_NDK_ROOT"] = path.appending(component: "ndk").nativePathString(escaped: false)

let sysroot = path.appending(component: "sysroot")
var driver = try Driver(args: [
"swiftc", "-target", "aarch64-unknown-linux-android", "-sysroot", sysroot.pathString, #file
], env: env)
let jobs = try driver.planBuild().removingAutolinkExtractJobs()
let frontend = try XCTUnwrap(jobs.first)
XCTAssertJobInvocationMatches(frontend, .flag("-sysroot"), .path(.absolute(sysroot)))
}

// The default NDK prebuilts are x86_64 hosts only currently as if r27.
#if arch(x86_64)
do {
let sysroot = path.appending(component: "ndk")

var env = env
env["ANDROID_NDK_ROOT"] = sysroot.nativePathString(escaped: false)

#if os(Windows)
let os = "windows"
#elseif os(macOS)
let os = "darwin"
#else
let os = "linux"
#endif

var driver = try Driver(args: [
"swiftc", "-target", "aarch64-unknown-linux-android", #file
], env: env)
let jobs = try driver.planBuild().removingAutolinkExtractJobs()
let frontend = try XCTUnwrap(jobs.first)
XCTAssertJobInvocationMatches(frontend, .flag("-sysroot"), .path(.absolute(sysroot.appending(components: "toolchains", "llvm", "prebuilt", "\(os)-x86_64", "sysroot"))))
}
#endif
}
}

func testEmitAPIDescriptorEmitModule() throws {
try withTemporaryDirectory { path in
do {
Expand Down