Gradle, native: Correct path to LLVM in K/N tool runner

Currently we have the same directory as llvmHome and targetToolchain
but strictly speaking we need to use llvmHome.
This commit is contained in:
Ilya Matveev
2019-05-27 14:30:09 +03:00
parent cfb8e75829
commit b002d572fb
@@ -160,11 +160,11 @@ internal class KonanInteropRunner(project: Project, additionalJvmArgs: List<Stri
KonanCliRunner("cinterop", "Kotlin/Native cinterop tool", project, additionalJvmArgs) {
init {
if (HostManager.host == KonanTarget.MINGW_X64) {
// TODO: Read it from KonanDistribution when it is accessible.
// TODO: Read it from Platform properties when it is accessible.
val konanProperties = Properties().apply {
project.file("${project.konanHome}/konan/konan.properties").inputStream().use(::load)
}
val toolchainDir = konanProperties.getProperty("targetToolchain.mingw_x64")
val toolchainDir = konanProperties.getProperty("llvmHome.mingw_x64")
if (toolchainDir != null) {
environment.put(
"PATH",