infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-20 07:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

8268142: Switch to jdk-17+24 for macosx-aarch64 at Oracle

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Mikael Vidstedt 2021-06-04 03:14:35 +00:00
parent edca245d5a
commit 1b4378e58e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
make/conf/jib-profiles.js
View File

@ -396,7 +396,7 @@ var getJibProfilesCommon = function (input, data) {
if (input.build_os == 'macosx' && input.build_cpu == 'aarch64') {
common.boot_jdk_version = "17";
common.boot_jdk_build_number = "19";
common.boot_jdk_build_number = "24";
} else {
common.boot_jdk_version = "16";
common.boot_jdk_build_number = "36";
@ -1069,9 +1069,15 @@ var getJibProfilesDependencies = function (input, common) {
devkit_cross_prefix = input.build_platform + "-to-";
}
}
var boot_jdk_platform = (input.build_os == "macosx" ? "osx" : input.build_os)
+ "-" + input.build_cpu;
var boot_jdk_os = input.build_os;
if (input.build_os == "macosx") {
if (input.build_cpu == "aarch64") {
boot_jdk_os = "macos";
} else {
boot_jdk_os = "osx";
}
}
var boot_jdk_platform = boot_jdk_os + "-" + input.build_cpu;
var boot_jdk_ext = (input.build_os == "windows" ? ".zip" : ".tar.gz")
// If running in WSL and building for Windows, it will look like Linux,
// but we need a Windows boot JDK.