Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

GITHUB#12655: javac options via -J only when the compiler is in forked mode.

Dawid Weiss11ff9b757091
diff --git a/gradle/hacks/turbocharge-jvm-opts.gradle b/gradle/hacks/turbocharge-jvm-opts.gradle
index 2e857d3a21c..c366e14739e 100644
--- a/gradle/hacks/turbocharge-jvm-opts.gradle
+++ b/gradle/hacks/turbocharge-jvm-opts.gradle
@@ -52,8 +52,8 @@ allprojects {
// are not part of up-to-date checks but these are internal JVM flags so we
// don't care.
//
- // Pass VM options via -J only with a custom javaHome AND when java toolchains are not used.
- if (task.options.forkOptions.javaHome != null && task.javaCompiler.getOrNull() == null) {
+ // Pass VM options via -J when a custom javaHome is used and we're in fork mode.
+ if (task.options.fork && task.options.forkOptions.javaHome != null) {
return vmOpts.collect {"-J" + it}
} else {
return vmOpts