From ef4bcb314c544bf491cfbe79b475537b9869ef43 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Sun, 1 Sep 2024 04:39:32 -0700 Subject: [PATCH] Use -mmacos-version-min instead of -mmacosx-version-min (#13640) --- Makefile | 2 +- scripts/env.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fb5b180219..d9f2ae2fd9 100644 --- a/Makefile +++ b/Makefile @@ -366,7 +366,7 @@ ifeq ($(OS_NAME),linux) endif ifeq ($(OS_NAME),darwin) -MACOS_MIN_FLAG=-mmacosx-version-min=$(MIN_MACOS_VERSION) +MACOS_MIN_FLAG=-mmacos-version-min=$(MIN_MACOS_VERSION) POSIX_PKG_MANAGER=brew INCLUDE_DIRS += $(MAC_INCLUDE_DIRS) endif diff --git a/scripts/env.sh b/scripts/env.sh index 296934c037..7f778c9a33 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -133,8 +133,8 @@ fi if [[ $UNAME_OS == 'Darwin' ]]; then export CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET:-13.0} CMAKE_FLAGS+=(-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}) - export CFLAGS="$CFLAGS -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -D__DARWIN_NON_CANCELABLE=1 " - export CXXFLAGS="$CXXFLAGS -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -D__DARWIN_NON_CANCELABLE=1 " + export CFLAGS="$CFLAGS -mmacos-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -D__DARWIN_NON_CANCELABLE=1 " + export CXXFLAGS="$CXXFLAGS -mmacos-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -D__DARWIN_NON_CANCELABLE=1 " fi mkdir -p $BUN_DEPS_OUT_DIR