Skip to content

Commit 3d3f583

Browse files
committed
[Macros] Add the correct RPATH flags to pure Swift host libraries, like the in-process plugin server
Also, make sure the in-process plugin server builds for Android.
1 parent dfd9efe commit 3d3f583

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

cmake/modules/AddPureSwift.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ function(add_pure_swift_host_library name)
193193
# Create the library.
194194
add_library(${name} ${libkind} ${APSHL_SOURCES})
195195
_add_host_swift_compile_options(${name})
196+
if(APSHL_SHARED)
197+
_set_pure_swift_link_flags(${name} "../../")
198+
endif()
196199

197200
set_property(TARGET ${name}
198201
PROPERTY BUILD_WITH_INSTALL_RPATH YES)

tools/swift-plugin-server/Sources/SwiftInProcPluginServer/InProcPluginServer.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import Darwin
1818
#elseif canImport(Glibc)
1919
import Glibc
20+
#elseif canImport(Bionic)
21+
import Bionic
2022
#elseif canImport(Musl)
2123
import Musl
2224
#elseif canImport(ucrt)

0 commit comments

Comments
 (0)