Native: fix classpath in KonanCliRunner
It included "konan/lib/*.jar", which became incorrect after adding
kotlin-native-compiler-embeddable.jar to K/N dist in 2baf344f5f:
after that, the classpath included both kotlin-native.jar and
kotlin-native-compiler-embeddable.jar, so it contained duplicating
classes.
Fix this by choosing particular .jar files from konan/lib, and use
kotlin-native-compiler-embeddable.jar.
This commit is contained in:
committed by
Space
parent
f7f64be269
commit
63a396b51d
+6
-1
@@ -66,7 +66,12 @@ internal abstract class KonanCliRunner(
|
||||
|
||||
final override val execSystemProperties by lazy { mapOf("konan.home" to konanHome) }
|
||||
|
||||
final override val classpath by lazy { project.fileTree("$konanHome/konan/lib/").apply { include("*.jar") }.files }
|
||||
final override val classpath by lazy {
|
||||
project.fileTree("$konanHome/konan/lib/").apply {
|
||||
include("trove4j.jar")
|
||||
include("kotlin-native-compiler-embeddable.jar")
|
||||
}.files
|
||||
}
|
||||
|
||||
final override fun checkClasspath() =
|
||||
check(classpath.isNotEmpty()) {
|
||||
|
||||
Reference in New Issue
Block a user