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

gradle-plugin: Don't set LIBRARY_PATH variables for stub-generator

Browse Source
This commit is contained in:
Ilya Matveev
2017-05-12 11:27:07 +07:00
committed by ilmat192
parent 5bd10dc112
commit 43582acbf1
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt
-2
View File
@@ -77,8 +77,6 @@ open class KonanInteropTask: DefaultTask() {
classpath = project.fileTree(INTEROP_CLASSPATH).apply { include("*.jar") } classpath = project.fileTree(INTEROP_CLASSPATH).apply { include("*.jar") }
jvmArgs(INTEROP_JVM_ARGS) jvmArgs(INTEROP_JVM_ARGS)
environment("LIBCLANG_DISABLE_CRASH_RECOVERY", "1") environment("LIBCLANG_DISABLE_CRASH_RECOVERY", "1")
environment("LD_LIBRARY_PATH", "${project.konanHome}/konan/nativelib")
environment("DYLD_LIBRARY_PATH", "${project.konanHome}/konan/nativelib")
args(buildArgs().apply { logger.info("Interop args: ${this.joinToString(separator = " ")}") }) args(buildArgs().apply { logger.info("Interop args: ${this.joinToString(separator = " ")}") })
} }
tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.gradle.api.internal.project.ProjectInternal
import org.gradle.internal.reflect.Instantiator import org.gradle.internal.reflect.Instantiator
/** /**
* We use the follwing properties: * We use the following properties:
* konan.home - directory where compiler is located (aka dist in konan project output). * konan.home - directory where compiler is located (aka dist in konan project output).
* konan.version - a konan compiler version for downloading. * konan.version - a konan compiler version for downloading.
*/ */