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

Revert "[K/N][runtime][interop] Refactoring to run cinterop in daemon"

Browse Source 
This reverts commit 47858126da.
This commit is contained in:
Igor Chevdar
2021-11-26 14:05:59 +05:00
parent 0ccb271323
commit 353f82f9e6
14 changed files with 88 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/main.kt
+1 -9
View File
@@ -8,8 +8,6 @@ import org.jetbrains.kotlin.native.interop.gen.defFileDependencies
import org.jetbrains.kotlin.cli.bc.main as konancMain
import org.jetbrains.kotlin.cli.klib.main as klibMain
import org.jetbrains.kotlin.cli.bc.mainNoExitWithGradleRenderer as konancMainForGradle
import org.jetbrains.kotlin.backend.konan.env.setEnv
import org.jetbrains.kotlin.konan.util.usingNativeMemoryAllocator
private fun mainImpl(args: Array<String>, konancMain: (Array<String>) -> Unit) {
val utilityName = args[0]
@@ -61,11 +59,5 @@ private fun mainImpl(args: Array<String>, konancMain: (Array<String>) -> Unit) {
fun main(args: Array<String>) = mainImpl(args, ::konancMain)
private fun setupClangEnv() {
setEnv("LIBCLANG_DISABLE_CRASH_RECOVERY", "1")
}
fun daemonMain(args: Array<String>) = mainImpl(args, ::konancMainForGradle)
fun daemonMain(args: Array<String>) = usingNativeMemoryAllocator {
setupClangEnv() // For in-process invocation have to setup proper environment manually.
mainImpl(args, ::konancMainForGradle)
}