From c925d00f9d5c8f3b0eacf5fe284d541955548e44 Mon Sep 17 00:00:00 2001
From: Peter Shipton <Peter_Shipton@ca.ibm.com>
Date: Wed, 13 Sep 2023 10:23:38 -0400
Subject: [PATCH] Set zlib default to bundled on amac

Backport of https://bugs.openjdk.org/browse/JDK-8286623

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
---
 make/autoconf/lib-bundled.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/lib-bundled.m4 b/make/autoconf/lib-bundled.m4
index 75f324f9c81..cee444e553b 100644
--- a/make/autoconf/lib-bundled.m4
+++ b/make/autoconf/lib-bundled.m4
@@ -163,7 +163,9 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
 
   DEFAULT_ZLIB=system
   if test "x$OPENJDK_TARGET_OS" = xwindows; then
-    # On windows default is bundled...on others default is system
+    # On windows default is bundled
+    DEFAULT_ZLIB=bundled
+  elif test "x$OPENJDK_TARGET_OS" = xmacosx -a "x$OPENJDK_TARGET_CPU" = xaarch64; then
     DEFAULT_ZLIB=bundled
   fi