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

One more fix for MinGW path in K/N runner

Browse Source
This commit is contained in:
denisgaebler
2018-12-13 12:31:47 +01:00
committed by Ilya Matveev
parent 02f2c941c8
commit be881442da
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeToolRunner.kt
+2 -3
View File
@@ -157,13 +157,12 @@ internal class KonanInteropRunner(project: Project, additionalJvmArgs: List<Stri
project.file("${project.konanHome}/konan/konan.properties").inputStream().use(::load) project.file("${project.konanHome}/konan/konan.properties").inputStream().use(::load)
} }
val toolchainDir = konanProperties.getProperty("targetToolchain.mingw_x64") val toolchainDir = konanProperties.getProperty("targetToolchain.mingw_x64")
if (toolchainDir != null) { if (toolchainDir != null) {
environment.put( environment.put(
"PATH", "PATH",
DependencyDirectories.defaultDependenciesRoot DependencyDirectories.defaultDependenciesRoot
.resolve("\\$toolchainDir\\bin") .resolve("$toolchainDir/bin")
.absolutePath + ";${environment.get("PATH")}" .absolutePath + ";${System.getenv("PATH")}"
) )
} }
} }