28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
diff --git a/swift-driver/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift b/swift-driver/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
|
|
index 06a29d8..5cbfddd 100644
|
|
--- a/swift-driver/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
|
|
+++ b/swift-driver/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
|
|
@@ -133,8 +137,7 @@ extension GenericUnixToolchain {
|
|
isShared: hasRuntimeArgs
|
|
)
|
|
|
|
- if hasRuntimeArgs && targetTriple.environment != .android &&
|
|
- toolchainStdlibRpath {
|
|
+ if hasRuntimeArgs && 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 {
|
|
diff --git a/swift/lib/Driver/UnixToolChains.cpp b/swift/lib/Driver/UnixToolChains.cpp
|
|
index bdc63d1ca72..971e5ded1e2 100644
|
|
--- a/swift/lib/Driver/UnixToolChains.cpp
|
|
+++ b/swift/lib/Driver/UnixToolChains.cpp
|
|
@@ -133,7 +133,7 @@ bool toolchains::GenericUnix::addRuntimeRPath(const llvm::Triple &T,
|
|
// copied into the bundle.
|
|
return Args.hasFlag(options::OPT_toolchain_stdlib_rpath,
|
|
options::OPT_no_toolchain_stdlib_rpath,
|
|
- !T.isAndroid());
|
|
+ true);
|
|
}
|
|
|
|
ToolChain::InvocationInfo
|