diff --git a/backend.native/build.gradle b/backend.native/build.gradle index 2b836284a4c..643e8562f94 100644 --- a/backend.native/build.gradle +++ b/backend.native/build.gradle @@ -169,7 +169,7 @@ task start(dependsOn: "${hostName}Start") targetList.each { target -> def konanJvmArgs = ["-ea", "-Dkonan.home=$distDir", - "-Djava.library.path=${project.buildDir}/nativelibs", + "-Djava.library.path=${project.buildDir}/nativelibs/$hostName", "-Dfile.encoding=UTF-8"] def defaultArgs = ['-nopack', '-nostdlib', '-nodefaultlibs', '-ea' ] diff --git a/build.gradle b/build.gradle index b9a6f445976..7ee0a4019bc 100644 --- a/build.gradle +++ b/build.gradle @@ -172,7 +172,7 @@ task distCompiler(type: Copy) { into('konan/lib') } - from(project(':backend.native').file('build/nativelibs')) { + from(project(':backend.native').file("build/nativelibs/$hostName")) { into('konan/nativelib') } diff --git a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy index 5fdc6a96bdd..71a34108970 100644 --- a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy +++ b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy @@ -28,6 +28,7 @@ import org.gradle.api.tasks.JavaExec import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.TaskDependency import org.gradle.internal.reflect.Instantiator +import org.jetbrains.kotlin.konan.target.* class NamedNativeInteropConfig implements Named { @@ -145,7 +146,8 @@ class NamedNativeInteropConfig implements Named { } File getNativeLibsDir() { - return new File(project.buildDir, "nativelibs") + def target = new TargetManager(target).target.userName + return new File(project.buildDir, "nativelibs/$target") } File getGeneratedSrcDir() {