From a915b57b96f1a0ee495ed7eab8073c8fc9e16f6e Mon Sep 17 00:00:00 2001
From: Adam Brousseau <adam.brousseau88@gmail.com>
Date: Tue, 12 Sep 2023 22:15:42 -0400
Subject: [PATCH] Don't bundle zlib for OpenJ9 builds

Related #3459 eclipse-openj9/openj9#18127

Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
---
 sbin/build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sbin/build.sh b/sbin/build.sh
index b27bf8c14..4fde12786 100755
--- a/sbin/build.sh
+++ b/sbin/build.sh
@@ -552,8 +552,10 @@ configureFreetypeLocation() {
 }
 
 configureZlibLocation() {
-  if [[ ! "${CONFIGURE_ARGS}" =~ "--with-zlib" ]]; then
-    addConfigureArg "--with-zlib=" "bundled"
+  if [[ "${BUILD_CONFIG[BUILD_VARIANT]}" != "${BUILD_VARIANT_OPENJ9}" ]]; then
+    if [[ ! "${CONFIGURE_ARGS}" =~ "--with-zlib" ]]; then
+      addConfigureArg "--with-zlib=" "bundled"
+    fi
   fi
 }