From 43582acbf19bffdc8bacdb92c5429b796e424f19 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Fri, 12 May 2017 11:27:07 +0700 Subject: [PATCH] gradle-plugin: Don't set LIBRARY_PATH variables for stub-generator --- tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt | 2 -- tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt b/tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt index 44cc105f98c..b40fb9427c4 100644 --- a/tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt +++ b/tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt @@ -77,8 +77,6 @@ open class KonanInteropTask: DefaultTask() { classpath = project.fileTree(INTEROP_CLASSPATH).apply { include("*.jar") } jvmArgs(INTEROP_JVM_ARGS) 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 = " ")}") }) } diff --git a/tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt b/tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt index 1d437e1a650..8dcf6b921bb 100644 --- a/tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt +++ b/tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt @@ -26,7 +26,7 @@ import org.gradle.api.internal.project.ProjectInternal 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.version - a konan compiler version for downloading. */