Skip to content

Commit 454b116

Browse files
committed
8320942: Only set openjdk-target when cross compiling linux-aarch64
Reviewed-by: ihse, erikj
1 parent eb44baf commit 454b116

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

make/conf/jib-profiles.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,8 @@ var getJibProfilesCommon = function (input, data) {
407407
* @returns {{}} Profiles part of the configuration
408408
*/
409409
var getJibProfilesProfiles = function (input, common, data) {
410+
var cross_compiling = input.build_platform != input.target_platform;
411+
410412
// Main SE profiles
411413
var profiles = {
412414

@@ -484,14 +486,12 @@ var getJibProfilesProfiles = function (input, common, data) {
484486
"linux-aarch64": {
485487
target_os: "linux",
486488
target_cpu: "aarch64",
487-
build_cpu: "x64",
488489
dependencies: ["devkit", "gtest", "build_devkit", "pandoc"],
489490
configure_args: [
490-
"--openjdk-target=aarch64-linux-gnu",
491491
"--with-zlib=system",
492492
"--disable-dtrace",
493493
"--enable-compatible-cds-alignment",
494-
],
494+
].concat(cross_compiling ? ["--openjdk-target=aarch64-linux-gnu"] : []),
495495
},
496496

497497
"linux-arm32": {

0 commit comments

Comments
 (0)