Skip to content

[native] Add toolchain span back deployment rpaths when required #9164

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
Sep 22, 2025
Merged

[native] Add toolchain span back deployment rpaths when required #9164

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
19 changes: 17 additions & 2 deletions Sources/Build/BuildDescription/ProductBuildDescription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,19 +318,34 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
throw InternalError("unexpectedly asked to generate linker arguments for a plugin product")
}

// When deploying to macOS prior to macOS 12, add an rpath to the
// back-deployed concurrency libraries.
if useStdlibRpath, triple.isMacOSX {
let macOSSupportedPlatform = self.package.getSupportedPlatform(for: .macOS, usingXCTest: product.isLinkingXCTest)

if macOSSupportedPlatform.version.major < 12 {
// When deploying to macOS prior to macOS 12, add an rpath to the
// back-deployed concurrency libraries.
let backDeployedStdlib = try buildParameters.toolchain.macosSwiftStdlib
.parentDirectory
.parentDirectory
.appending("swift-5.5")
.appending("macosx")
args += ["-Xlinker", "-rpath", "-Xlinker", backDeployedStdlib.pathString]
}

if macOSSupportedPlatform.version.major < 26 {
// When deploying to macOS prior to macOS 26, add an rpath to the
// back-deployed Span library.
let backDeployedStdlib = try buildParameters.toolchain.macosSwiftStdlib
.parentDirectory
.parentDirectory
.appending("swift-6.2")
.appending("macosx")
args += ["-Xlinker", "-rpath", "-Xlinker", backDeployedStdlib.pathString]
}

// If either back deployment library is used, the driver is responsible for injecting
// a /usr/lib/swift -rpath at the front to ensure OS content is preferred when
// available.
}
} else {
// Don't link runtime compatibility patch libraries if there are no
Expand Down
19 changes: 15 additions & 4 deletions Tests/BuildTests/BuildPlanTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-Xlinker", "-rpath", "-Xlinker", "@loader_path",
"@\(buildPath.appending(components: "exe.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", defaultTargetTriple,
"-Xlinker", "-add_ast_path", "-Xlinker",
buildPath.appending(components: "Modules", "lib.swiftmodule").pathString,
Expand Down Expand Up @@ -1150,6 +1151,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-Xlinker", "-rpath", "-Xlinker", "@loader_path",
"@\(buildPath.appending(components: "exe.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", defaultTargetTriple,
"-g",
])
Expand Down Expand Up @@ -1244,6 +1246,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-Xlinker", "-rpath", "-Xlinker", "@loader_path",
"@\(buildPath.appending(components: "exe.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", defaultTargetTriple,
"-g",
])
Expand Down Expand Up @@ -1794,6 +1797,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-Xlinker", "-rpath", "-Xlinker", "@loader_path",
"@\(buildPath.appending(components: "exe.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", defaultTargetTriple,
"-Xlinker", "-add_ast_path", "-Xlinker", "/path/to/build/\(result.plan.destinationBuildParameters.triple)/debug/exe.build/exe.swiftmodule",
"-g",
Expand Down Expand Up @@ -2353,11 +2357,12 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {

#if os(macOS)
let version = MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .macOS).versionString
let rpathsForBackdeployment: [String]
var rpathsForBackdeployment: [String] = []
if let version = try? Version(string: version, lenient: true), version.major < 12 {
rpathsForBackdeployment = ["-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx"]
} else {
rpathsForBackdeployment = []
rpathsForBackdeployment += ["-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx"]
}
if let version = try? Version(string: version, lenient: true), version.major < 26 {
rpathsForBackdeployment += ["-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx"]
}
XCTAssertEqual(
try result.buildProduct(for: "PkgPackageTests").linkArguments(),
Expand Down Expand Up @@ -2475,6 +2480,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-Xlinker", "-dead_strip",
"-Xlinker", "-rpath", "-Xlinker", "@loader_path",
"@\(buildPath.appending(components: "exe.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", hostTriple.tripleString(forPlatformVersion: "12.0"),
"-g",
])
Expand Down Expand Up @@ -2846,6 +2852,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-Xlinker", "-rpath", "-Xlinker", "@loader_path",
"@\(buildPath.appending(components: "exe.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", defaultTargetTriple,
"-Xlinker", "-add_ast_path",
"-Xlinker", buildPath.appending(components: "exe.build", "exe.swiftmodule").pathString,
Expand Down Expand Up @@ -2992,6 +2999,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-Xlinker", "-rpath", "-Xlinker", "@loader_path",
"@\(buildPath.appending(components: "Foo.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", defaultTargetTriple,
"-Xlinker", "-add_ast_path",
"-Xlinker", buildPath.appending(components: "Foo.build", "Foo.swiftmodule").pathString,
Expand All @@ -3009,6 +3017,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-Xlinker", "-rpath", "-Xlinker", "@loader_path",
"@\(buildPath.appending(components: "Bar-Baz.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", defaultTargetTriple,
"-Xlinker", "-add_ast_path",
"-Xlinker", buildPath.appending(components: "Modules", "Bar.swiftmodule").pathString,
Expand Down Expand Up @@ -3165,6 +3174,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-Xlinker", "-rpath", "-Xlinker", "@loader_path",
"@\(buildPath.appending(components: "lib.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", defaultTargetTriple,
"-Xlinker", "-add_ast_path", "-Xlinker",
buildPath.appending(components: "Modules", "lib.swiftmodule").pathString,
Expand Down Expand Up @@ -7295,6 +7305,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
"-emit-executable",
"@\(buildPath.appending(components: "exe.product", "Objects.LinkFileList"))",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-5.5/macosx",
"-Xlinker", "-rpath", "-Xlinker", "/fake/path/lib/swift-6.2/macosx",
"-target", defaultTargetTriple,
"-Xlinker", "-add_ast_path",
"-Xlinker", buildPath.appending(components: "Modules", "lib.swiftmodule").pathString,
Expand Down