Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8286623: Bundle zlib by default with JDK on macos aarch64
Reviewed-by: lancea, ihse, erikj
  • Loading branch information
jaikiran committed May 13, 2022
1 parent 617ef54 commit c3bade2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion make/autoconf/lib-bundled.m4
Expand Up @@ -166,7 +166,9 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
DEFAULT_ZLIB=system
if test "x$OPENJDK_TARGET_OS" = xwindows -o "x$OPENJDK_TARGET_OS" = xaix; then
# On windows and aix default is bundled, on others default is system
# On windows and aix default is bundled
DEFAULT_ZLIB=bundled
elif test "x$OPENJDK_TARGET_OS" = xmacosx -a "x$OPENJDK_TARGET_CPU" = xaarch64; then
DEFAULT_ZLIB=bundled
fi
Expand Down
2 changes: 1 addition & 1 deletion make/conf/jib-profiles.js
Expand Up @@ -450,7 +450,7 @@ var getJibProfilesProfiles = function (input, common, data) {
target_os: "macosx",
target_cpu: "aarch64",
dependencies: ["devkit", "gtest", "pandoc"],
configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
configure_args: concat(common.configure_args_64bit,
"--with-macosx-version-max=11.00.00"),
},

Expand Down

1 comment on commit c3bade2

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.