Load bundled GMP library on Windows if not present

oldk1331 · Sep 23, 2023 · 7e14b14 · 7e14b14
1 parent ad800b3
commit 7e14b14
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -35,6 +35,7 @@ jobs:
       run: |
         rm ../build/target/x86_64-w64-mingw32/bin/fricas
         mv ../build/target/x86_64-w64-mingw32 FriCAS-windows-x86_64
+        cp /mingw64/bin/libgmp-10.dll FriCAS-windows-x86_64/lib/
         zip -r FriCAS-windows-x86_64-${{ github.sha }}.zip FriCAS-windows-x86_64
     - name: Upload Windows binary
       uses: actions/upload-artifact@v3

diff --git a/src/lisp/num_gmp.lisp b/src/lisp/num_gmp.lisp
@@ -824,12 +824,16 @@
           (symbol-function 'orig-isqrt))
     (sb-ext:lock-package "COMMON-LISP")))
 
+(defun load-gmp-lib ()
+    #-:WIN32 (ignore-errors (|quiet_load_alien| "libgmp.so") t)
+    #+:WIN32 (if (ignore-errors (|quiet_load_alien| "libgmp-10.dll") t)
+                 t
+                 (ignore-errors (|quiet_load_alien|
+                     (BOOT::make-absolute-filename "/lib/libgmp-10.dll")) t))
+
 (defun init-gmp(wrapper-lib)
     (if (not *gmp-multiplication-initialized*)
-        (if (ignore-errors (|quiet_load_alien|
-                            #-:WIN32 "libgmp.so"
-                            #+:WIN32 "libgmp-10.dll"
-                            ) t)
+        (if (load-gmp-lib)
             (if (ignore-errors
                     (|quiet_load_alien| wrapper-lib) t)
                 (progn