8320942: Only set openjdk-target when cross compiling linux-aarch64

Reviewed-by: ihse, erikj
This commit is contained in:
Mikael Vidstedt 2023-11-29 19:02:25 +00:00
parent eb44bafe77
commit 454b11653c

View File

@ -407,6 +407,8 @@ var getJibProfilesCommon = function (input, data) {
* @returns {{}} Profiles part of the configuration
*/
var getJibProfilesProfiles = function (input, common, data) {
var cross_compiling = input.build_platform != input.target_platform;
// Main SE profiles
var profiles = {
@ -484,14 +486,12 @@ var getJibProfilesProfiles = function (input, common, data) {
"linux-aarch64": {
target_os: "linux",
target_cpu: "aarch64",
build_cpu: "x64",
dependencies: ["devkit", "gtest", "build_devkit", "pandoc"],
configure_args: [
"--openjdk-target=aarch64-linux-gnu",
"--with-zlib=system",
"--disable-dtrace",
"--enable-compatible-cds-alignment",
],
].concat(cross_compiling ? ["--openjdk-target=aarch64-linux-gnu"] : []),
},
"linux-arm32": {