diff --git a/make/autoconf/lib-bundled.m4 b/make/autoconf/lib-bundled.m4 index f2b103e09df01..d30ad70b7be93 100644 --- a/make/autoconf/lib-bundled.m4 +++ b/make/autoconf/lib-bundled.m4 @@ -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 diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index eb8e6fde7063a..023d5f9a3b4f1 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -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"), },