Skip to content

Commit 4b0b196

Browse files
committed
unconditionally do 'make exports' on windows, add debug check
1 parent 7fde304 commit 4b0b196

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

tools/build_gfortran.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ static_libname=$(find $OBP/lib -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a
1313
dynamic_libname=$(find $OBP/lib -maxdepth 1 -type f -name '*.dll.a' | tail -1)
1414
dll_name=$(echo $dynamic_libname | sed 's#/lib/#/bin/#' | sed 's/.a$//')
1515

16+
grep dpotrf $OBP/include/*
17+
nm $static_libname | grep dpotrf
18+
1619
cp $dll_name .
1720

1821
if [ "$INTERFACE64" == "1" ]; then

tools/build_openblas.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,17 @@ make BINARY=$build_bits DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 \
100100
make PREFIX=$openblas_root/$build_bits $interface64_flags \
101101
SYMBOLPREFIX="scipy_" install
102102
DLL_BASENAME=libscipy_openblas${SYMBOLSUFFIX}_${LIBNAMESUFFIX}
103-
if [ "$if_bits" == "64" ]; then
104-
# OpenBLAS does not build a symbol-suffixed static library on Windows:
105-
# do it ourselves
106-
set -x # echo commands
107-
static_libname=$(find . -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a' | tail -1)
108-
make -C exports SYMBOLPREFIX="scipy_" $interface64_flags objcopy.def
109-
objcopy --redefine-syms exports/objcopy.def "${static_libname}" "${static_libname}.renamed"
110-
cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${static_libname}"
111-
cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${DLL_BASENAME}.a"
112-
set +x
113-
fi
103+
104+
# OpenBLAS does not build a symbol-suffixed static library on Windows:
105+
# do it ourselves
106+
set -x # echo commands
107+
static_libname=$(find . -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a' | tail -1)
108+
make -C exports SYMBOLPREFIX="scipy_" $interface64_flags objcopy.def
109+
objcopy --redefine-syms exports/objcopy.def "${static_libname}" "${static_libname}.renamed"
110+
cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${static_libname}"
111+
cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${DLL_BASENAME}.a"
112+
set +x
113+
114114
cd $openblas_root
115115
# Copy library link file for custom name
116116
cd $build_bits/lib

0 commit comments

Comments
 (0)