Skip to content

Commit 3888ae3

Browse files
committed
[Macros] Add the correct RPATH flags to the in-process plugin server host library
Also, make sure it builds for Android.
1 parent ffba6d1 commit 3888ae3

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

tools/swift-plugin-server/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ if (SWIFT_BUILD_SWIFT_SYNTAX)
2525
set_property(TARGET SwiftInProcPluginServer
2626
APPEND PROPERTY INSTALL_RPATH
2727
"$ORIGIN")
28+
_set_pure_swift_link_flags(SwiftInProcPluginServer "../../")
2829
endif()
2930

3031
# FXIME: Importing package-cmo enabled '.swiftmodule' causes compiler crash :(

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)