diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh
index cb0507333..40de54f97 100755
--- a/tools/macOS_dependencies_setup.sh
+++ b/tools/macOS_dependencies_setup.sh
@@ -213,7 +213,7 @@ cat << EOF | patch Makefile.osx -
  CPP_X86_64 = \$(shell xcrun -find clang++)
  MACOSX_DEPLOY = -mmacosx-version-min=\$(MACOSX_DEPLOYMENT_TARGET)
 -COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__
-+COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ -DHAVE_UNISTD_H -DDISABLE_PERF_MEASUREMENT -DPNG_ARM_NEON_OPT=0
++COMPILERFLAGS = -O2 -DNDEBUG -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ -DHAVE_UNISTD_H -DDISABLE_PERF_MEASUREMENT -DPNG_ARM_NEON_OPT=0
  COMPILERFLAGS_I386 = -arch i386
 -COMPILERFLAGS_X86_64 = -arch x86_64
 +COMPILERFLAGS_X86_64 = -arch arm64
@@ -232,7 +232,7 @@ cat << EOF | patch Makefile.osx -
  CPP_X86_64 = \$(shell xcrun -find clang++)
  MACOSX_DEPLOY = -mmacosx-version-min=\$(MACOSX_DEPLOYMENT_TARGET)
 -COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__
-+COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ -DHAVE_UNISTD_H -DDISABLE_PERF_MEASUREMENT
++COMPILERFLAGS = -O2 -DNDEBUG -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ -DHAVE_UNISTD_H -DDISABLE_PERF_MEASUREMENT
  COMPILERFLAGS_I386 = -arch i386
  COMPILERFLAGS_X86_64 = -arch x86_64
  COMPILERPPFLAGS = -Wno-ctor-dtor-privacy -D__ANSI__ -std=c++11 -stdlib=libc++ -Wc++11-narrowing