diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt index d6724bb575b..c78c4c7bbf8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt @@ -26,7 +26,10 @@ internal abstract class KotlinToolRunner( open val execEnvironmentBlacklist: Set = emptySet() open val execSystemProperties: Map = emptyMap() - open val execSystemPropertiesBlacklist: Set = setOf("java.endorsed.dirs") + open val execSystemPropertiesBlacklist: Set = setOf( + "java.endorsed.dirs", // Fix for KT-25887 + "user.dir" // Don't propagate the working dir of the current Gradle process + ) abstract val classpath: Set open fun checkClasspath(): Unit = check(classpath.isNotEmpty()) { "Classpath of the tool is empty: $displayName" }