Merge "Support experimental building with OpenJDK 21" into main

2023-11-29 20:25:25 +00:00
parent 29e05d1007 0760c89882
commit 8f7ee30d21
2 changed files with 10 additions and 1 deletions
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -133,7 +133,12 @@ func init() {
 		if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" {
 			return override
 		}
-		return "17"
+		switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN") {
+		case "true":
+			return "21"
+		default:
+			return "17"
+		}
 	})

 	pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin")