Fix android static link libstdcxx for mtmd#958
Fix android static link libstdcxx for mtmd#958AsbjornOlling wants to merge 2 commits intoutilityai:mainfrom
Conversation
b4f37c8 to
5d50ff0
Compare
|
Whoops, accidentally had some unrelated commits on the same branch. Cleaned it up and force pushed. |
|
Also bumped llama.cpp submodule to the latest tagged build. The version currently on 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. |
|
lgtm. when this isn't a draft and CI passes I will merge |
|
conflict with #952 I think, I'll take whichever is newer. |
|
The llama.cpp commit on this branch is newer - b8310 here vs b8233 on #952 |
|
could you take yous in the merge? will merge once that's done. |
fd4026f to
b054075
Compare
|
@MarcusDunn rebased on main. |
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.