Mac OS Clang 17+ compile fix

Author: andressbarajas

scripts/001-binutils.sh

@@ -36,15 +36,24 @@ TARGET_ALIAS="ee"
 TARG_XTRA_OPTS=""
 OSVER=$(uname)
 
-## If using MacOS Apple, set gmp and mpfr paths using TARG_XTRA_OPTS 
+## If using MacOS Apple, set gmp and mpfr paths using TARG_XTRA_OPTS
 ## (this is needed for Apple Silicon but we will do it for all MacOS systems)
 if [ "$(uname -s)" = "Darwin" ]; then
+  ## Determine if we should add --with-system-zlib (for Clang ≥ 17)
+  macos_zlib_flag=$(clang --version 2>&1 | \
+    head -n1 | \
+    grep -qE 'clang.*version ([1-9][7-9]|[2-9][0-9])' && echo "--with-system-zlib")
+
   ## Check if using brew
   if command -v brew &> /dev/null; then
-    TARG_XTRA_OPTS="--with-gmp=$(brew --prefix gmp) --with-mpfr=$(brew --prefix mpfr)"
+    TARG_XTRA_OPTS="--with-gmp=$(brew --prefix gmp) \
+                    --with-mpfr=$(brew --prefix mpfr) \
+                    $macos_zlib_flag"
   elif command -v port &> /dev/null; then
-  ## Check if using MacPorts
-    TARG_XTRA_OPTS="--with-gmp=$(port -q prefix gmp) --with-mpfr=$(port -q prefix mpfr)"
+    ## Check if using MacPorts
+    TARG_XTRA_OPTS="--with-gmp=$(port -q prefix gmp) \
+                    --with-mpfr=$(port -q prefix mpfr) \
+                    $macos_zlib_flag"
   fi
 fi
 

scripts/002-gcc-stage1.sh

@@ -37,17 +37,28 @@ TARG_XTRA_OPTS=""
 TARGET_CFLAGS="-O2 -gdwarf-2 -gz"
 OSVER=$(uname)
 
-## If using MacOS Apple, set gmp, mpfr and mpc paths using TARG_XTRA_OPTS 
+## If using MacOS Apple, set gmp, mpfr and mpc paths using TARG_XTRA_OPTS
 ## (this is needed for Apple Silicon but we will do it for all MacOS systems)
 if [ "$(uname -s)" = "Darwin" ]; then
+  ## Determine if we should add --with-system-zlib (for Clang ≥ 17)
+  macos_zlib_flag=$(clang --version 2>&1 | \
+    head -n1 | \
+    grep -qE 'clang.*version ([1-9][7-9]|[2-9][0-9])' && echo "--with-system-zlib")
+
   ## Check if using brew
   if command -v brew &> /dev/null; then
-    TARG_XTRA_OPTS="--with-gmp=$(brew --prefix gmp) --with-mpfr=$(brew --prefix mpfr) --with-mpc=$(brew --prefix libmpc)"
+    TARG_XTRA_OPTS="--with-gmp=$(brew --prefix gmp) \
+                    --with-mpfr=$(brew --prefix mpfr) \
+                    --with-mpc=$(brew --prefix libmpc) \
+                    $macos_zlib_flag"
   elif command -v port &> /dev/null; then
   ## Check if using MacPorts
     MACPORT_BASE=$(dirname `port -q contents gmp|grep gmp.h`|sed s#/include##g)
     echo Macport base is $MACPORT_BASE
-    TARG_XTRA_OPTS="--with-gmp=$MACPORT_BASE --with-mpfr=$MACPORT_BASE --with-mpc=$MACPORT_BASE"
+    TARG_XTRA_OPTS="--with-gmp=$MACPORT_BASE \
+                    --with-mpfr=$MACPORT_BASE \
+                    --with-mpc=$MACPORT_BASE \
+                    $macos_zlib_flag"
   fi
 fi
 

scripts/006-gcc-stage2.sh

@@ -37,17 +37,28 @@ TARG_XTRA_OPTS=""
 TARGET_CFLAGS="-O2 -gdwarf-2 -gz"
 OSVER=$(uname)
 
-## If using MacOS Apple, set gmp, mpfr and mpc paths using TARG_XTRA_OPTS 
+## If using MacOS Apple, set gmp, mpfr and mpc paths using TARG_XTRA_OPTS
 ## (this is needed for Apple Silicon but we will do it for all MacOS systems)
 if [ "$(uname -s)" = "Darwin" ]; then
+  ## Determine if we should add --with-system-zlib (for Clang ≥ 17)
+  macos_zlib_flag=$(clang --version 2>&1 | \
+    head -n1 | \
+    grep -qE 'clang.*version ([1-9][7-9]|[2-9][0-9])' && echo "--with-system-zlib")
+
   ## Check if using brew
   if command -v brew &> /dev/null; then
-    TARG_XTRA_OPTS="--with-gmp=$(brew --prefix gmp) --with-mpfr=$(brew --prefix mpfr) --with-mpc=$(brew --prefix libmpc)"
+    TARG_XTRA_OPTS="--with-gmp=$(brew --prefix gmp) \
+                    --with-mpfr=$(brew --prefix mpfr) \
+                    --with-mpc=$(brew --prefix libmpc) \
+                    $macos_zlib_flag"
   elif command -v port &> /dev/null; then
   ## Check if using MacPorts
-    MACPORT_BASE=$(dirname `port -q contents gmp|grep gmp.h`|sed s#/include##g)
-    echo Macport base is $MACPORT_BASE
-    TARG_XTRA_OPTS="--with-gmp=$MACPORT_BASE --with-mpfr=$MACPORT_BASE --with-mpc=$MACPORT_BASE"
+    MACPORT_BASE=$(dirname `port -q contents gmp | grep gmp.h` | sed 's#/include##g')
+    echo "MacPort base is $MACPORT_BASE"
+    TARG_XTRA_OPTS="--with-gmp=$MACPORT_BASE \
+                    --with-mpfr=$MACPORT_BASE \
+                    --with-mpc=$MACPORT_BASE \
+                    $macos_zlib_flag"
   fi
 fi