llm: statically link pthread and stdc++ dependencies in windows build

llm: add GGML_STATIC flag to windows static lib
llm: add COMMON_DARWIN_DEFS to arm static build (#5513 )
2024-07-06 12:54:02 -04:00 · 2024-07-06 03:27:05 -04:00 · 2024-07-05 22:42:42 -04:00
2 changed files with 3 additions and 2 deletions
--- a/llm/generate/gen_darwin.sh
+++ b/llm/generate/gen_darwin.sh
@@ -75,7 +75,7 @@ case "${GOARCH}" in
    # Static build for linking into the Go binary
    init_vars
    CMAKE_TARGETS="--target llama --target ggml"
-    CMAKE_DEFS="-DCMAKE_OSX_DEPLOYMENT_TARGET=11.3 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -DCMAKE_OSX_ARCHITECTURES=${ARCH} ${CMAKE_DEFS}"
+    CMAKE_DEFS="${COMMON_DARWIN_DEFS} -DCMAKE_OSX_DEPLOYMENT_TARGET=11.3 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -DCMAKE_OSX_ARCHITECTURES=${ARCH} ${CMAKE_DEFS}"
    BUILD_DIR="../build/darwin/${ARCH}_static"
    echo "Building static library"
    build
--- a/llm/llm.go
+++ b/llm/llm.go
@@ -1,7 +1,8 @@
 package llm

 // #cgo CFLAGS: -Illama.cpp -Illama.cpp/include -Illama.cpp/ggml/include
-// #cgo LDFLAGS: -lllama -lggml -lstdc++
+// #cgo LDFLAGS: -lllama -lggml -lstdc++ -lpthread
+// #cgo windows LDFLAGS: -static-libstdc++ -static-libgcc -static
 // #cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/build/darwin/arm64_static -L${SRCDIR}/build/darwin/arm64_static/src -L${SRCDIR}/build/darwin/arm64_static/ggml/src -framework Accelerate -framework Metal
 // #cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/build/darwin/x86_64_static -L${SRCDIR}/build/darwin/x86_64_static/src -L${SRCDIR}/build/darwin/x86_64_static/ggml/src
 // #cgo windows,amd64 LDFLAGS: -L${SRCDIR}/build/windows/amd64_static -L${SRCDIR}/build/windows/amd64_static/src -L${SRCDIR}/build/windows/amd64_static/ggml/src
Author	SHA1	Message	Date
jmorganca	f1a379aa56	llm: statically link pthread and stdc++ dependencies in windows build	2024-07-06 12:54:02 -04:00
jmorganca	9ae146993e	llm: add `GGML_STATIC` flag to windows static lib	2024-07-06 03:27:05 -04:00
Jeffrey Morgan	e0348d3fe8	llm: add `COMMON_DARWIN_DEFS` to arm static build (#5513 )	2024-07-05 22:42:42 -04:00