Skip to content

Commit 5b682e6

Browse files
bump-llvm[bot]github-actions[bot]makslevental
authored
[LLVM] Bump to 24d5c4ff7 (#145)
* [LLVM] Bump to 3af43e303 * build windows with staticlinking crt and etc * Update llvm_cache.cmake --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: makslevental <maksim.levental@gmail.com>
1 parent c68dbc6 commit 5b682e6

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

build_tools/build_llvm.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ cmake_options=(
4545
-DPython_EXECUTABLE="$Python3_EXECUTABLE"
4646
-DPYTHON_EXECUTABLE="$Python3_EXECUTABLE"
4747
-DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_DIR}"
48+
-DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON
49+
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
4850
)
4951

5052
if [ -x "$(command -v ccache)" ]; then

build_tools/build_llvm_wasi.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ cmake_options=(
4747
-DCMAKE_BUILD_TYPE=Release
4848
-DCMAKE_EXE_LINKER_FLAGS="--emit-symbol-map -sSTANDALONE_WASM=1 -sWASM=1 -sWASM_BIGINT=1 -sEXPORT_ALL=0 -sEXPORTED_RUNTIME_METHODS=cwrap,ccall,getValue,setValue,writeAsciiToMemory,wasmTable -lembind"
4949
-DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_DIR}"
50+
-DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON
5051
-DCMAKE_SYSTEM_NAME=Emscripten
5152
-DCMAKE_TOOLCHAIN_FILE="$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
5253
-DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_C_COMPILER=$CC;-DCMAKE_CXX_COMPILER=$CXX"

build_tools/cmake/llvm_cache.cmake

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,31 @@ set(LLVM_INSTALL_UTILS ON CACHE BOOL "")
1818
set(LLVM_ENABLE_DUMP ON CACHE BOOL "")
1919

2020
set(LLVM_BUILD_LLVM_DYLIB ON CACHE BOOL "")
21-
# All the tools will use libllvm shared library
22-
# (but doesn't work on windows)
23-
if (NOT WIN32)
21+
if (WIN32)
22+
set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded CACHE STRING "")
23+
list(APPEND CMAKE_C_FLAGS "/MT")
24+
list(APPEND CMAKE_CXX_FLAGS "/MT")
25+
else()
26+
# All the tools will use libllvm shared library
27+
# (but doesn't work on windows)
2428
set(LLVM_LINK_LLVM_DYLIB ON CACHE BOOL "")
2529
set(MLIR_LINK_MLIR_DYLIB ON CACHE BOOL "")
2630
endif()
2731

2832
# useful things
2933
set(LLVM_ENABLE_ASSERTIONS ON CACHE BOOL "")
30-
set(LLVM_ENABLE_WARNINGS ON CACHE BOOL "")
34+
if (WIN32)
35+
set(LLVM_ENABLE_WARNINGS OFF CACHE BOOL "")
36+
else()
37+
set(LLVM_ENABLE_WARNINGS ON CACHE BOOL "")
38+
endif()
3139
set(LLVM_FORCE_ENABLE_STATS ON CACHE BOOL "")
3240
# because AMD target td files are insane...
3341
set(LLVM_TARGETS_TO_BUILD "host;NVPTX;AMDGPU" CACHE STRING "")
3442
set(LLVM_OPTIMIZED_TABLEGEN ON CACHE BOOL "")
3543
set(LLVM_ENABLE_RTTI ON CACHE BOOL "")
44+
set(LLVM_VERSION_SUFFIX "" CACHE STRING "")
45+
set(CMAKE_PLATFORM_NO_VERSIONED_SONAME ON CACHE BOOL "")
3646

3747
# MLIR options
3848

third_party/llvm-project

Submodule llvm-project updated 440 files

0 commit comments

Comments
 (0)