admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS and Linux backwards compatibility (#819)

Browse Source 
* Disable optional LLVM and LLDB dependencies. Target macOS 10.11 at minimum.

* flake
This commit is contained in:
juj
2021-05-18 17:36:47 +03:00
committed by GitHub
parent b33aaafbcd
commit d1b4543658
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
emsdk.py
View File

@@ -1056,9 +1056,19 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg
generator = ['-G', generator] generator = ['-G', generator]
else: else:
generator = [] generator = []
cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE=' + build_type, '-DPYTHON_EXECUTABLE=' + sys.executable] + extra_cmake_args + [src_root]
cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE=' + build_type, '-DPYTHON_EXECUTABLE=' + sys.executable]
# 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)) 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.11'
def quote_parens(x): def quote_parens(x):
if ' ' in x: if ' ' in x:
return '"' + x.replace('"', '\\"') + '"' return '"' + x.replace('"', '\\"') + '"'
@@ -1218,10 +1228,13 @@ def build_llvm(tool):
targets_to_build = 'WebAssembly' targets_to_build = 'WebAssembly'
args = ['-DLLVM_TARGETS_TO_BUILD=' + targets_to_build, args = ['-DLLVM_TARGETS_TO_BUILD=' + targets_to_build,
'-DLLVM_INCLUDE_EXAMPLES=OFF', '-DLLVM_INCLUDE_EXAMPLES=OFF',
'-DCLANG_INCLUDE_EXAMPLES=OFF',
'-DLLVM_INCLUDE_TESTS=' + tests_arg, '-DLLVM_INCLUDE_TESTS=' + tests_arg,
'-DCLANG_INCLUDE_TESTS=' + tests_arg, '-DCLANG_INCLUDE_TESTS=' + tests_arg,
'-DLLVM_ENABLE_ASSERTIONS=' + ('ON' if enable_assertions else 'OFF')] '-DLLVM_ENABLE_ASSERTIONS=' + ('ON' if enable_assertions else 'OFF'),
# Disable optional LLVM dependencies, these can cause unwanted .so dependencies
# that prevent distributing the generated compiler for end users.
'-DLLVM_ENABLE_LIBXML2=OFF', '-DLLVM_ENABLE_TERMINFO=OFF', '-DLLDB_ENABLE_LIBEDIT=OFF',
'-DLLVM_ENABLE_LIBEDIT=OFF', '-DLLVM_ENABLE_LIBPFM=OFF']
# LLVM build system bug: looks like everything needs to be passed to LLVM_ENABLE_PROJECTS twice. (or every second field is ignored?) # LLVM build system bug: looks like everything needs to be passed to LLVM_ENABLE_PROJECTS twice. (or every second field is ignored?)
# LLVM build system bug #2: compiler-rt does not build on Windows. It insists on performing a CMake install step that writes to C:\Program Files. Attempting # LLVM build system bug #2: compiler-rt does not build on Windows. It insists on performing a CMake install step that writes to C:\Program Files. Attempting

2
scripts/update_python.py
View File

@@ -108,7 +108,7 @@ def build_python():
check_call(['brew', 'install', 'openssl', 'pkg-config']) check_call(['brew', 'install', 'openssl', 'pkg-config'])
if platform.machine() == 'x86_64': if platform.machine() == 'x86_64':
prefix = '/usr/local' prefix = '/usr/local'
min_macos_version = '10.13' min_macos_version = '10.11'
elif platform.machine() == 'arm64': elif platform.machine() == 'arm64':
prefix = '/opt/homebrew' prefix = '/opt/homebrew'
min_macos_version = '11.0' min_macos_version = '11.0'