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

Only pass -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON when building llvm. NFC (#1334)

Browse Source
This commit is contained in:
Sam Clegg
2024-01-24 20:09:59 +00:00
committed by GitHub
parent 96bd9f0c9a
commit f2baa2f56a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
emsdk.py
View File

@@ -962,13 +962,10 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg
generator = [] generator = []
cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE=' + build_type, '-DPYTHON_EXECUTABLE=' + sys.executable] cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE=' + build_type, '-DPYTHON_EXECUTABLE=' + sys.executable]
# Target macOS 10.14 at minimum, to support widest range of Mac devices from "Early 2008" and newer: # Target macOS 10.14 at minimum, to support widest range of Mac devices
# from "Early 2008" and newer:
# https://en.wikipedia.org/wiki/MacBook_(2006-2012)#Supported_operating_systems # https://en.wikipedia.org/wiki/MacBook_(2006-2012)#Supported_operating_systems
cmdline += ['-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14'] cmdline += ['-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14']
# To enable widest possible chance of success for building, let the code
# compile through with older toolchains that are about to be deprecated by
# upstream LLVM.
cmdline += ['-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON']
cmdline += extra_cmake_args + [src_root] cmdline += extra_cmake_args + [src_root]
print('Running CMake: ' + str(cmdline)) print('Running CMake: ' + str(cmdline))
@@ -1106,6 +1103,10 @@ def build_llvm(tool):
# (there instead of $(Configuration), one would need ${CMAKE_BUILD_TYPE} ?) # (there instead of $(Configuration), one would need ${CMAKE_BUILD_TYPE} ?)
# It looks like compiler-rt is not compatible to build on Windows? # It looks like compiler-rt is not compatible to build on Windows?
args += ['-DLLVM_ENABLE_PROJECTS=clang;lld'] args += ['-DLLVM_ENABLE_PROJECTS=clang;lld']
# To enable widest possible chance of success for building, let the code
# compile through with older toolchains that are about to be deprecated by
# upstream LLVM.
args += ['-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON']
if os.getenv('LLVM_CMAKE_ARGS'): if os.getenv('LLVM_CMAKE_ARGS'):
extra_args = os.environ['LLVM_CMAKE_ARGS'].split(',') extra_args = os.environ['LLVM_CMAKE_ARGS'].split(',')