Skip to content

Commit db61b4e

Browse files
authored
Merge pull request #36 from andressbarajas/macos_clang_fix
Fix MacOS Clang 17+ compile issue
2 parents ba29b86 + c13775e commit db61b4e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

scripts/001-binutils.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ TARGET_ALIAS="iop"
3737
TARG_XTRA_OPTS=""
3838
OSVER=$(uname)
3939

40-
## If using MacOS Apple, set gmp and mpfr paths using TARG_XTRA_OPTS
40+
## If using MacOS Apple, set gmp and mpfr paths using TARG_XTRA_OPTS
4141
## (this is needed for Apple Silicon but we will do it for all MacOS systems)
4242
if [ "$(uname -s)" = "Darwin" ]; then
4343
## Check if using brew
4444
if command -v brew &> /dev/null; then
45-
TARG_XTRA_OPTS="--with-gmp=$(brew --prefix gmp) --with-mpfr=$(brew --prefix mpfr)"
45+
TARG_XTRA_OPTS="--with-system-zlib --with-gmp=$(brew --prefix gmp) --with-mpfr=$(brew --prefix mpfr)"
4646
elif command -v port &> /dev/null; then
4747
## Check if using MacPorts
4848
MACPORT_BASE=$(dirname `port -q contents gmp|grep gmp.h`|sed s#/include##g)
4949
echo Macport base is $MACPORT_BASE
50-
TARG_XTRA_OPTS="--with-gmp=$MACPORT_BASE --with-mpfr=$MACPORT_BASE"
50+
TARG_XTRA_OPTS="--with-system-zlib --with-gmp=$MACPORT_BASE --with-mpfr=$MACPORT_BASE"
5151
fi
5252
fi
5353

scripts/002-gcc-stage1.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ TARG_XTRA_OPTS=""
3838
TARGET_CFLAGS="-O2 -gdwarf-2 -gz"
3939
OSVER=$(uname)
4040

41-
## If using MacOS Apple, set gmp, mpfr and mpc paths using TARG_XTRA_OPTS
41+
## If using MacOS Apple, set gmp, mpfr and mpc paths using TARG_XTRA_OPTS
4242
## (this is needed for Apple Silicon but we will do it for all MacOS systems)
4343
if [ "$(uname -s)" = "Darwin" ]; then
4444
## Check if using brew
4545
if command -v brew &> /dev/null; then
46-
TARG_XTRA_OPTS="--with-gmp=$(brew --prefix gmp) --with-mpfr=$(brew --prefix mpfr) --with-mpc=$(brew --prefix libmpc)"
46+
TARG_XTRA_OPTS="--with-system-zlib --with-gmp=$(brew --prefix gmp) --with-mpfr=$(brew --prefix mpfr) --with-mpc=$(brew --prefix libmpc)"
4747
elif command -v port &> /dev/null; then
4848
## Check if using MacPorts
4949
MACPORT_BASE=$(dirname `port -q contents gmp|grep gmp.h`|sed s#/include##g)
5050
echo Macport base is $MACPORT_BASE
51-
TARG_XTRA_OPTS="--with-gmp=$MACPORT_BASE --with-mpfr=$MACPORT_BASE --with-mpc=$MACPORT_BASE"
51+
TARG_XTRA_OPTS="--with-system-zlib --with-gmp=$MACPORT_BASE --with-mpfr=$MACPORT_BASE --with-mpc=$MACPORT_BASE"
5252
fi
5353
fi
5454

0 commit comments

Comments
 (0)