Skip to content

Commit 717ac9b

Browse files
committed
Allow macos-10.15 as target
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 3ce0800 commit 717ac9b

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

setup/check_target.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ function check_target() {
3030
MACOS_UNIVERSAL=1
3131
PAWPAW_SKIP_FORTIFY=1
3232
;;
33+
"macos-10.15"|"macos-universal-10.15")
34+
CLANG=1
35+
MACOS=1
36+
MACOS_UNIVERSAL=1
37+
MACOS_UNIVERSAL_10_15=1
38+
PAWPAW_SKIP_FORTIFY=1
39+
;;
3340
"wasm")
3441
CLANG=1
3542
CROSS_COMPILING=1

setup/env.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,13 @@ elif [ -n "${LINUX_TARGET}" ] && [ "${LINUX_TARGET}" != "linux-aarch64" ] && [ "
100100
fi
101101

102102
if [ "${MACOS}" -eq 1 ]; then
103-
if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
103+
if [ "${MACOS_UNIVERSAL_10_15}" -eq 1 ]; then
104+
BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_15"
105+
BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_15"
106+
BUILD_FLAGS+=" -mmacosx-version-min=10.15"
107+
BUILD_FLAGS+=" -arch x86_64 -arch arm64"
108+
export MACOSX_DEPLOYMENT_TARGET="10.15"
109+
elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
104110
BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12"
105111
BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12"
106112
BUILD_FLAGS+=" -mmacosx-version-min=10.12"

0 commit comments

Comments
 (0)