Skip to content

Android: add the stdlib RPATH when natively building on Android with Termux #1561

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
May 24, 2024
Merged

Android: add the stdlib RPATH when natively building on Android with Termux #1561

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
12 changes: 10 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 @@ -173,8 +173,16 @@ extension GenericUnixToolchain {
isShared: hasRuntimeArgs
)

if hasRuntimeArgs && targetTriple.environment != .android &&
toolchainStdlibRpath {
// An exception is made for native Android environments like the Termux
// app as they build and run natively like a Unix environment on Android,
// so add the stdlib RPATH by default there.
#if os(Android)
let addRpath = true
#else
let addRpath = targetTriple.environment != .android
#endif

if hasRuntimeArgs && addRpath && toolchainStdlibRpath {
// FIXME: We probably shouldn't be adding an rpath here unless we know
// ahead of time the standard library won't be copied.
for path in runtimePaths {
Expand Down