Skip to content

[Unix] Go back to checking the runtime resource path for swiftrt.o if -sysroot unspecified #1822

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

Open
finagolfin wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −10
Open

[Unix] Go back to checking the runtime resource path for swiftrt.o if -sysroot unspecified #1822

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
cdc476f
[Unix] Go back to only checking the runtime resource path for swiftrt.o
finagolfin Feb 27, 2025
14c512a
Only change if `-sysroot` is specified
finagolfin Nov 10, 2025
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: 3 additions & 2 deletions Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,9 @@ extension GenericUnixToolchain {

if !isEmbeddedEnabled && !parsedOptions.hasArgument(.nostartfiles) {
let rsrc: VirtualPath
// Prefer the swiftrt.o runtime file from the SDK if it's specified.
if let sdk = targetInfo.sdkPath {
// Prefer the swiftrt.o runtime file from the SDK, if it's specified
// with a separate C/C++ sysroot.
if let sdk = targetInfo.sdkPath, parsedOptions.hasArgument(.sysroot) {
let swiftDir: String
if staticStdlib || staticExecutable {
swiftDir = "swift_static"
Expand Down
11 changes: 3 additions & 8 deletions Tests/SwiftDriverTests/ToolchainTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,18 +485,13 @@ import CRT

@Test func relativeResourceDir() async throws {
do {
// Reset the environment to avoid 'SDKROOT' influencing the
// linux driver paths and taking the priority over the resource directory.
var env = ProcessEnv.block
env["SDKROOT"] = nil
var driver = try TestDriver(
args: [
"swiftc",
"-target", "x86_64-unknown-linux", "-lto=llvm-thin",
"foo.swift",
"-resource-dir", "resource/dir",
],
env: env
]
)
let plannedJobs = try await driver.planBuild().removingAutolinkExtractJobs()

Expand All @@ -518,7 +513,7 @@ import CRT
}
}

@Test func sdkDirLinuxPrioritizedOverRelativeResourceDirForLinkingSwiftRT() async throws {
@Test func RelativeResourceDirLinuxPrioritizedOverSDKDirForLinkingSwiftRT() async throws {
do {
let sdkRoot = try testInputsPath.appending(component: "mock-sdk.sdk")
var env = ProcessEnv.block
Expand All @@ -539,7 +534,7 @@ import CRT
#expect(linkJob.kind == .link)
try expectJobInvocationMatches(
linkJob,
toPathOption(sdkRoot.pathString + "/usr/lib/swift/linux/x86_64/swiftrt.o", isRelative: false)
toPathOption("resource/dir/linux/x86_64/swiftrt.o")
)
}
}
Expand Down