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

Fix args ordering in LLVM build from previous commit (#1179)

Browse Source
This commit is contained in:
juj
2023-01-28 15:58:49 +02:00
committed by GitHub
parent fa5f5f374f
commit 592b7b74e4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
emsdk.py
View File

@@ -1070,15 +1070,16 @@ def build_llvm(tool):
targets_to_build = 'WebAssembly;AArch64' targets_to_build = 'WebAssembly;AArch64'
else: else:
targets_to_build = 'WebAssembly' targets_to_build = 'WebAssembly'
args = ['-DLLVM_TARGETS_TO_BUILD=' + targets_to_build, cmake_generator, args = get_generator_and_config_args(tool)
'-DLLVM_INCLUDE_EXAMPLES=OFF', args += ['-DLLVM_TARGETS_TO_BUILD=' + targets_to_build,
'-DLLVM_INCLUDE_TESTS=' + tests_arg, '-DLLVM_INCLUDE_EXAMPLES=OFF',
'-DCLANG_INCLUDE_TESTS=' + tests_arg, '-DLLVM_INCLUDE_TESTS=' + tests_arg,
'-DLLVM_ENABLE_ASSERTIONS=' + ('ON' if enable_assertions else 'OFF'), '-DCLANG_INCLUDE_TESTS=' + tests_arg,
# Disable optional LLVM dependencies, these can cause unwanted .so dependencies '-DLLVM_ENABLE_ASSERTIONS=' + ('ON' if enable_assertions else 'OFF'),
# that prevent distributing the generated compiler for end users. # Disable optional LLVM dependencies, these can cause unwanted .so dependencies
'-DLLVM_ENABLE_LIBXML2=OFF', '-DLLVM_ENABLE_TERMINFO=OFF', '-DLLDB_ENABLE_LIBEDIT=OFF', # that prevent distributing the generated compiler for end users.
'-DLLVM_ENABLE_LIBEDIT=OFF', '-DLLVM_ENABLE_LIBPFM=OFF'] '-DLLVM_ENABLE_LIBXML2=OFF', '-DLLVM_ENABLE_TERMINFO=OFF', '-DLLDB_ENABLE_LIBEDIT=OFF',
'-DLLVM_ENABLE_LIBEDIT=OFF', '-DLLVM_ENABLE_LIBPFM=OFF']
# LLVM build system bug: 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: compiler-rt does not build on Windows. It insists on performing a CMake install step that writes to C:\Program Files. Attempting
# to reroute that to build_root directory then fails on an error # to reroute that to build_root directory then fails on an error
# file INSTALL cannot find # file INSTALL cannot find
@@ -1086,7 +1087,6 @@ 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']
cmake_generator, args = get_generator_and_config_args(tool)
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(',')