windows: set DLL_BASENAME properly, macos: simplify and fix

MacPython · Oct 31, 2023 · a217777 · a217777
1 parent 400074e
commit a217777
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -66,8 +66,8 @@ jobs:
         & $env:BASH_PATH -lc tools/build_gfortran.sh
         echo "Static test"
         .\for_test\test.exe
-        # echo "Dynamic test"
-        # .\for_test\test_dyn.exe
+        echo "Dynamic test"
+        .\for_test\test_dyn.exe
 
     - name: Copy
       run: |

diff --git a/tools/build_openblas.sh b/tools/build_openblas.sh
@@ -99,7 +99,7 @@ make BINARY=$build_bits DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 \
      $interface64_flags
 make PREFIX=$openblas_root/$build_bits $interface64_flags \
  .   SYMBOLPREFIX="scipy_" install
-DLL_BASENAME=libopenblas${SYMBOLSUFFIX}_${LIBNAMESUFFIX}
+DLL_BASENAME=libscipy_openblas${SYMBOLSUFFIX}_${LIBNAMESUFFIX}
 if [ "$if_bits" == "64" ]; then
     # OpenBLAS does not build a symbol-suffixed static library on Windows:
     # do it ourselves

diff --git a/tools/build_steps.sh b/tools/build_steps.sh
@@ -146,14 +146,14 @@ function do_build_lib {
     esac
     case $interface64 in
         1)
-            local interface64_flags="INTERFACE64=1 SYMBOLSUFFIX=64_ OBJCONV=$PWD/objconv/objconv";
+            local interface_flags="INTERFACE64=1 SYMBOLSUFFIX=64_ SYMBOLPREFIX=scipy_ OBJCONV=$PWD/objconv/objconv";
             local symbolsuffix="64_";
             if [ -n "$IS_OSX" ]; then
                 $PWD/objconv/objconv --help
             fi
             ;;
         *)
-            local interface64_flags=""
+            local interface_flags="SYMBOLPREFIX=scipy_ OBJCONV=$PWD/objconv/objconv"
             local symbolsuffix="";
             ;;
     esac
@@ -163,11 +163,11 @@ function do_build_lib {
     git config --global --add safe.directory '*'
     pushd OpenBLAS
     patch_source
-    CFLAGS="$CFLAGS -fvisibility=protected -Wno-maybe-uninitialized" \
+    CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
     make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
-        USE_OPENMP=0 NUM_THREADS=64 SYMBOLPREFIX=scipy_ \
-        BINARY=$bitness $interface64_flags $target_flags > /dev/null
-    make PREFIX=$BUILD_PREFIX $interface64_flags SYMBOLPREFIX=scipy_ install
+        USE_OPENMP=0 NUM_THREADS=64 \
+        BINARY=$bitness $interface_flags $target_flags > /dev/null
+    make PREFIX=$BUILD_PREFIX $interface_flags install
     popd
     stop_spinner
     if [ "$nightly" = "1" ]; then