Skip to content

Commit 1b4378e

Browse files
committed
8268142: Switch to jdk-17+24 for macosx-aarch64 at Oracle
Reviewed-by: erikj
1 parent edca245 commit 1b4378e

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

make/conf/jib-profiles.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ var getJibProfilesCommon = function (input, data) {
396396

397397
if (input.build_os == 'macosx' && input.build_cpu == 'aarch64') {
398398
common.boot_jdk_version = "17";
399-
common.boot_jdk_build_number = "19";
399+
common.boot_jdk_build_number = "24";
400400
} else {
401401
common.boot_jdk_version = "16";
402402
common.boot_jdk_build_number = "36";
@@ -1069,9 +1069,15 @@ var getJibProfilesDependencies = function (input, common) {
10691069
devkit_cross_prefix = input.build_platform + "-to-";
10701070
}
10711071
}
1072-
1073-
var boot_jdk_platform = (input.build_os == "macosx" ? "osx" : input.build_os)
1074-
+ "-" + input.build_cpu;
1072+
var boot_jdk_os = input.build_os;
1073+
if (input.build_os == "macosx") {
1074+
if (input.build_cpu == "aarch64") {
1075+
boot_jdk_os = "macos";
1076+
} else {
1077+
boot_jdk_os = "osx";
1078+
}
1079+
}
1080+
var boot_jdk_platform = boot_jdk_os + "-" + input.build_cpu;
10751081
var boot_jdk_ext = (input.build_os == "windows" ? ".zip" : ".tar.gz")
10761082
// If running in WSL and building for Windows, it will look like Linux,
10771083
// but we need a Windows boot JDK.

0 commit comments

Comments
 (0)