llm: only statically link libstdc++

llm: statically link pthread and stdc++ dependencies in windows build
2024-07-06 14:06:20 -04:00 · 2024-07-06 12:54:02 -04:00
3 changed files with 6 additions and 2 deletions
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -304,6 +304,10 @@ jobs:
          write-host "Installing plugin"
          & "${env:RUNNER_TEMP}\plugin\*\kmscng.msi" /quiet
          write-host "plugin installed"
+      - name: remove unwanted mingw dll.a files
+        run: |
+          Remove-Item "C:\mingw64\x86_64-w64-mingw32\lib\libpthread.dll.a"
+          Remove-Item "C:\mingw64\x86_64-w64-mingw32\lib\libwinpthread.dll.a"
      - uses: actions/setup-go@v5
        with:
          go-version-file: go.mod
--- a/llm/generate/gen_windows.ps1
+++ b/llm/generate/gen_windows.ps1
@@ -204,7 +204,6 @@ function build_static() {
            "-DCMAKE_C_COMPILER=gcc.exe",
            "-DCMAKE_CXX_COMPILER=g++.exe",
            "-DBUILD_SHARED_LIBS=off",
-            "-DGGML_STATIC=on",
            "-DGGML_NATIVE=off",
            "-DGGML_AVX=off",
            "-DGGML_AVX2=off",
--- 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 windows LDFLAGS: -static-libstdc++
+// #cgo LDFLAGS: -lllama -lggml -lstdc++ -lpthread
 // #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	5796bfc401	llm: only statically link libstdc++	2024-07-06 14:06:20 -04:00
jmorganca	f1a379aa56	llm: statically link pthread and stdc++ dependencies in windows build	2024-07-06 12:54:02 -04:00