Skip to content

Commit

Permalink
Allow macos-10.15 as target
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Dec 11, 2022
1 parent 3ce0800 commit 717ac9b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
7 changes: 7 additions & 0 deletions setup/check_target.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ function check_target() {
MACOS_UNIVERSAL=1
PAWPAW_SKIP_FORTIFY=1
;;
"macos-10.15"|"macos-universal-10.15")
CLANG=1
MACOS=1
MACOS_UNIVERSAL=1
MACOS_UNIVERSAL_10_15=1
PAWPAW_SKIP_FORTIFY=1
;;
"wasm")
CLANG=1
CROSS_COMPILING=1
Expand Down
8 changes: 7 additions & 1 deletion setup/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,13 @@ elif [ -n "${LINUX_TARGET}" ] && [ "${LINUX_TARGET}" != "linux-aarch64" ] && [ "
fi

if [ "${MACOS}" -eq 1 ]; then
if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
if [ "${MACOS_UNIVERSAL_10_15}" -eq 1 ]; then
BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_15"
BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_15"
BUILD_FLAGS+=" -mmacosx-version-min=10.15"
BUILD_FLAGS+=" -arch x86_64 -arch arm64"
export MACOSX_DEPLOYMENT_TARGET="10.15"
elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12"
BUILD_FLAGS+=" -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12"
BUILD_FLAGS+=" -mmacosx-version-min=10.12"
Expand Down

0 comments on commit 717ac9b

Please sign in to comment.