Skip to content

Commit 53da7d1

Browse files
committed
Use runtime jdk when patching
1 parent 69d7f04 commit 53da7d1

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

test/immutable-collections-patch/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ generatePatch.configure {
3131

3232
classpath = sourceSets.main.runtimeClasspath
3333
mainClass = 'org.elasticsearch.jdk.patch.ImmutableCollectionsPatcher'
34+
if (buildParams.getIsRuntimeJavaHomeSet()) {
35+
executable = "${buildParams.runtimeJavaHome.get()}/bin/java" + (OS.current() == OS.WINDOWS ? '.exe' : '')
36+
} else {
3437
javaLauncher = javaToolchains.launcherFor {
3538
languageVersion = JavaLanguageVersion.of(VersionProperties.bundledJdkMajorVersion)
3639
vendor = VersionProperties.bundledJdkVendor == "openjdk" ?
3740
JvmVendorSpec.ORACLE :
3841
JvmVendorSpec.matching(VersionProperties.bundledJdkVendor)
3942
}
43+
}
4044
doFirst {
4145
args outputDir.get().getAsFile().toString()
4246
}

0 commit comments

Comments
 (0)