Skip to content

Use Rust Nightly only on Emscripten #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khj809 merged 1 commit into from
Aug 8, 2025
Merged

Use Rust Nightly only on Emscripten #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ if(DEFINED EMSCRIPTEN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -pthread")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ASYNCIFY=1 -s FETCH=1 -s ALLOW_MEMORY_GROWTH=1 -s WASM_BIGINT=1 -fexceptions -lembind")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXPORTED_RUNTIME_METHODS=['ccall','cwrap','stringToNewUTF8']")
set(RUST_NIGHTLY ON)
set(RUSTFLAGS "-Ctarget-feature=+atomics,+bulk-memory")
set(CARGO_BUILD_FLAGS "-Z;build-std=std,panic_abort")
else()
set(RUST_NIGHTLY OFF)
set(AILOY_WITH_TVM ON CACHE BOOL "Enable tvm support")
endif()
set(TVM_ROOT "" CACHE PATH "Root directory of mlc-llm. If AILOY_WITH_TVM is ON and this is empty, it will be downloaded automatically.")
Expand Down
4 changes: 2 additions & 2 deletions vm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ target_link_libraries(ailoy_vm_obj PRIVATE indicators::indicators)
# minijinja
set(MINIJINJA_BUILD_SHARED OFF)
set(MINIJINJA_INSTALL OFF)
set(MINIJINJA_RUST_NIGHTLY ON)
set(MINIJINJA_RUST_NIGHTLY ${RUST_NIGHTLY})
set(MINIJINJA_RUST_FLAGS "${RUSTFLAGS}")
set(MINIJINJA_CARGO_BUILD_FLAGS "${CARGO_BUILD_FLAGS}")
FetchContent_Declare(
Expand Down Expand Up @@ -50,9 +50,9 @@ target_link_libraries(ailoy_vm_obj PUBLIC tinyexpr)
target_link_libraries(ailoy_vm_obj PRIVATE magic_enum)

# tokenizers-cpp
set(TOKENIZERS_CPP_RUST_NIGHTLY ${RUST_NIGHTLY})
set(TOKENIZERS_CPP_RUST_FLAGS "${RUSTFLAGS}")
set(TOKENIZERS_CPP_CARGO_FLAGS "${CARGO_BUILD_FLAGS}")
set(TOKENIZERS_CPP_RUST_NIGHTLY ON)
if(NODE)
set(TOKENIZERS_CPP_MSVC_RUNTIME_LIBRARY "MT" CACHE STRING "" FORCE)
endif()
Expand Down