Skip to content

Fix android static link libstdcxx for mtmd#958

Open
AsbjornOlling wants to merge 2 commits intoutilityai:mainfrom
AsbjornOlling:fix-android-static-link-libstdcxx-for-mtmd
Open

Fix android static link libstdcxx for mtmd#958
AsbjornOlling wants to merge 2 commits intoutilityai:mainfrom
AsbjornOlling:fix-android-static-link-libstdcxx-for-mtmd

Conversation

@AsbjornOlling
Copy link
Contributor

@AsbjornOlling AsbjornOlling commented Mar 13, 2026

I recently added #947
but it has a bad interaction with the mtmd feature added in #938

The mtmd build stuff doesn't respect the static stdcxx stuff.

I'm leaving this as draft until I've tested it on my project downstream, but it should be correct.

@AsbjornOlling AsbjornOlling force-pushed the fix-android-static-link-libstdcxx-for-mtmd branch from b4f37c8 to 5d50ff0 Compare March 13, 2026 11:00
@AsbjornOlling
Copy link
Contributor Author

Whoops, accidentally had some unrelated commits on the same branch. Cleaned it up and force pushed.

@AsbjornOlling
Copy link
Contributor Author

Also bumped llama.cpp submodule to the latest tagged build.

The version currently on main has a bug that breaks all windows builds. On my project we pinned this crate to one of the nightly branches of this repo precisely to get the fix for that bug (which has been upstreamed for a little while in llama.cpp).

When I was building and running my test suites on my project using this PR branch, I hit a bunch of windows failures. Hence the submodule bump.

@MarcusDunn
Copy link
Contributor

lgtm. when this isn't a draft and CI passes I will merge

@MarcusDunn MarcusDunn marked this pull request as ready for review March 13, 2026 20:54
@MarcusDunn
Copy link
Contributor

conflict with #952 I think, I'll take whichever is newer.

@AsbjornOlling
Copy link
Contributor Author

The llama.cpp commit on this branch is newer - b8310 here vs b8233 on #952

@MarcusDunn
Copy link
Contributor

could you take yous in the merge? will merge once that's done.

@AsbjornOlling AsbjornOlling force-pushed the fix-android-static-link-libstdcxx-for-mtmd branch from fd4026f to b054075 Compare March 16, 2026 15:30
@AsbjornOlling
Copy link
Contributor Author

@MarcusDunn rebased on main.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants