Revert "Update CMAKE_OSX_DEPLOYMENT_TARGET from 10.11 to 10.14 (#924)"

This reverts commit 99e5e0230d.
This commit is contained in:
Sam Clegg 2021-11-01 15:00:45 -07:00
Родитель 99e5e0230d
Коммит 69bc93a988
2 изменённых файлов: 5 добавлений и 6 удалений

Просмотреть файл

@ -1058,16 +1058,16 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg
generator = []
cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE=' + build_type, '-DPYTHON_EXECUTABLE=' + sys.executable]
# Target macOS Sierra (10.12) at minimum.
# This is the minimum version required to build binaryen.
cmdline += ['-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14']
# Target macOS 10.11 at minimum, to support widest range of Mac devices from "Mid 2007" and newer:
# https://en.wikipedia.org/wiki/MacBook_Pro#Supported_macOS_releases
cmdline += ['-DCMAKE_OSX_DEPLOYMENT_TARGET=10.11']
cmdline += extra_cmake_args + [src_root]
print('Running CMake: ' + str(cmdline))
# Specify the deployment target also as an env. var, since some Xcode versions
# read this instead of the CMake field.
os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.14'
os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.11'
def quote_parens(x):
if ' ' in x:

Просмотреть файл

@ -108,8 +108,7 @@ def build_python():
check_call(['brew', 'install', 'openssl', 'pkg-config'])
if platform.machine() == 'x86_64':
prefix = '/usr/local'
# Keep in sync with CMAKE_OSX_DEPLOYMENT_TARGET in emsdk.py
min_macos_version = '10.14'
min_macos_version = '10.11'
elif platform.machine() == 'arm64':
prefix = '/opt/homebrew'
min_macos_version = '11.0'