diff --git a/build.gradle.kts b/build.gradle.kts index f66070484f1..92b0cd98ba3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -716,12 +716,23 @@ fun jdkPath(version: String): String { fun Project.configureJvmProject(javaHome: String, javaVersion: String) { + val currentJavaHome = File(System.getProperty("java.home")!!).canonicalPath + val shouldFork = !currentJavaHome.startsWith(File(javaHome).canonicalPath) + tasks.withType { if (name != "compileJava9Java") { sourceCompatibility = javaVersion targetCompatibility = javaVersion - options.isFork = true - options.forkOptions.javaHome = file(javaHome) + + if (shouldFork) { + logger.info("$path will be forked with $javaHome") + options.isFork = true + options.forkOptions.javaHome = file(javaHome) + } else { + options.isFork = false + options.forkOptions.javaHome = null + } + options.compilerArgs.add("-proc:none") options.encoding = "UTF-8" }