Skip to content

Commit 9e53a16

Browse files
authored
Upgrade minimum macOS version to 10.15 (Catalina) (#257)
Required for C++17, aligned alloc etc.
1 parent f83d1f9 commit 9e53a16

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ for flavour in darwin-x64 darwin-arm64v8; do
4646
export PKG_CONFIG="$(brew --prefix)/bin/pkg-config --static"
4747

4848
# Earliest supported version of macOS
49-
export MACOSX_DEPLOYMENT_TARGET="10.13"
49+
export MACOSX_DEPLOYMENT_TARGET="10.15"
5050

5151
# Added -fno-stack-check to workaround a stack misalignment bug on macOS 10.15
5252
# See:

build/lin.sh

-3
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ fi
203203
mkdir ${DEPS}/zlib-ng
204204
$CURL https://github.com/zlib-ng/zlib-ng/archive/${VERSION_ZLIB_NG}.tar.gz | tar xzC ${DEPS}/zlib-ng --strip-components=1
205205
cd ${DEPS}/zlib-ng
206-
if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.13" ]; then
207-
sed -i'.bak' "/-DHAVE_ALIGNED_ALLOC/d" CMakeLists.txt
208-
fi
209206
CFLAGS="${CFLAGS} -O3" cmake -G"Unix Makefiles" \
210207
-DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \
211208
-DBUILD_SHARED_LIBS=FALSE -DZLIB_COMPAT=TRUE -DWITH_ARMV6=FALSE

platforms/darwin-x64/Toolchain.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SET(CMAKE_C_COMPILER clang)
22
SET(CMAKE_CXX_COMPILER clang++)
33

44
# Earliest supported version of macOS
5-
SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
5+
SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
66

77
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
88
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)

0 commit comments

Comments
 (0)