azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make binaries' rpath comply conventions on iOS and macOS

Browse Source 
This simplifies linking embedded frameworks.
See #2555
This commit is contained in:
Svyatoslav Scherbina
2019-01-18 18:24:13 +03:00
committed by SvyatoslavScherbina
parent 50376a0975
commit cfcfecf19e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+10
View File
@@ -158,9 +158,19 @@ open class MacOSBasedLinker(targetProperties: AppleConfigurables)
if (compilerRtLibrary != null) +compilerRtLibrary!! if (compilerRtLibrary != null) +compilerRtLibrary!!
+libraries +libraries
+linkerArgs +linkerArgs
+rpath(dynamic)
}) + if (debug) listOf(dsymUtilCommand(executable, outputDsymBundle)) else emptyList() }) + if (debug) listOf(dsymUtilCommand(executable, outputDsymBundle)) else emptyList()
} }
private fun rpath(dynamic: Boolean): List<String> = listOfNotNull(
when (target.family) {
Family.OSX -> "@executable_path/../Frameworks"
Family.IOS -> "@executable_path/Frameworks"
else -> error(target)
},
"@loader_path/Frameworks".takeIf { dynamic }
).flatMap { listOf("-rpath", it) }
fun dsymUtilCommand(executable: ExecutableFile, outputDsymBundle: String) = fun dsymUtilCommand(executable: ExecutableFile, outputDsymBundle: String) =
object : Command(dsymutilCommand(executable, outputDsymBundle)) { object : Command(dsymutilCommand(executable, outputDsymBundle)) {
override fun runProcess(): Int = override fun runProcess(): Int =