Browse Source

Revert "llm: only statically link libstdc++"

This reverts commit 5796bfc4013f4ebe26cdbf13554332a25c405027.
jmorganca 10 months ago
parent
commit
6cea036027
2 changed files with 1 additions and 5 deletions
  1. 0 4
      .github/workflows/release.yaml
  2. 1 1
      llm/llm.go

+ 0 - 4
.github/workflows/release.yaml

@@ -304,10 +304,6 @@ 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

+ 1 - 1
llm/llm.go

@@ -1,8 +1,8 @@
 package llm
 
 // #cgo CFLAGS: -Illama.cpp -Illama.cpp/include -Illama.cpp/ggml/include
-// #cgo windows LDFLAGS: -static-libstdc++
 // #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