Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions llama-cpp-sys-2/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,12 @@ fn main() {
mtmd_build.flag("/std:c++17");
}

// When static-stdcxx is enabled on Android, suppress the cc crate's automatic
// C++ stdlib linking (which defaults to c++_shared) so we can link c++_static instead.
if matches!(target_os, TargetOs::Android) && cfg!(feature = "static-stdcxx") {
mtmd_build.cpp_link_stdlib(None);
}

// Collect all .cpp files in tools/mtmd and its subdirectories
for entry in glob(mtmd_src.join("**/*.cpp").to_str().unwrap()).unwrap() {
match entry {
Expand Down
2 changes: 1 addition & 1 deletion llama-cpp-sys-2/llama.cpp
Submodule llama.cpp updated 322 files