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

gradle-plugin: Set LIBCLANG_DISABLE_CRASH_RECOVERY for compiler

Browse Source
This commit is contained in:
Ilya Matveev
2017-08-31 13:33:36 +07:00
committed by ilmat192
parent d0b3f46a77
commit 8f8c3fc600
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanToolRunner.kt
+8 -9
View File
@@ -3,7 +3,6 @@ package org.jetbrains.kotlin.gradle.plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.file.FileCollection import org.gradle.api.file.FileCollection
// Consider using JavaExecSPec
internal interface KonanToolRunner { internal interface KonanToolRunner {
val mainClass: String val mainClass: String
val classpath: FileCollection val classpath: FileCollection
@@ -17,14 +16,14 @@ internal interface KonanToolRunner {
internal abstract class KonanBaseRunner(val project: Project): KonanToolRunner { internal abstract class KonanBaseRunner(val project: Project): KonanToolRunner {
abstract val toolName: String abstract val toolName: String
override val classpath: FileCollection override val classpath: FileCollection =
get() = project.fileTree("${project.konanHome}/konan/lib/").apply { include("*.jar") } project.fileTree("${project.konanHome}/konan/lib/")
.apply { include("*.jar") }
override val jvmArgs: List<String> override val jvmArgs = mutableListOf("-Dkonan.home=${project.konanHome}",
get() = listOf("-Dkonan.home=${project.konanHome}", "-Djava.library.path=${project.konanHome}/konan/nativelib") "-Djava.library.path=${project.konanHome}/konan/nativelib")
override val environment: Map<String, Any> override val environment = mutableMapOf("LIBCLANG_DISABLE_CRASH_RECOVERY" to "1")
get() = emptyMap()
override fun run(args: List<String>) { override fun run(args: List<String>) {
if (classpath.isEmpty) { if (classpath.isEmpty) {
@@ -53,9 +52,9 @@ internal class KonanInteropRunner(project: Project) : KonanBaseRunner(project){
override val toolName get() = "Kotlin/Native cinterop tool" override val toolName get() = "Kotlin/Native cinterop tool"
override val mainClass get() = INTEROP_MAIN override val mainClass get() = INTEROP_MAIN
override val environment = mutableMapOf("LIBCLANG_DISABLE_CRASH_RECOVERY" to "1").apply { init {
if (project.host == "mingw") { if (project.host == "mingw") {
put("PATH", "${project.konanHome}\\dependencies" + environment.put("PATH", "${project.konanHome}\\dependencies" +
"\\msys2-mingw-w64-x86_64-gcc-6.3.0-clang-llvm-3.9.1-windows-x86-64" + "\\msys2-mingw-w64-x86_64-gcc-6.3.0-clang-llvm-3.9.1-windows-x86-64" +
"\\bin;${System.getenv("PATH")}") "\\bin;${System.getenv("PATH")}")
} }