Skip to content

Commit ff6cfd4

Browse files
committed
simplify, for now disable SYMBOLPREFIX to make sure tests pass on windows
1 parent 4b0b196 commit ff6cfd4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

tools/build_openblas.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,14 @@ fflags="$fextra $cflags -frecursive -ffpe-summary=invalid,zero"
7575
# Set suffixed-ILP64 flags
7676
if [ "$if_bits" == "64" ]; then
7777
SYMBOLSUFFIX="64_"
78-
interface64_flags="INTERFACE64=1 SYMBOLSUFFIX=${SYMBOLSUFFIX}"
78+
interface_flags="INTERFACE64=1 SYMBOLSUFFIX=${SYMBOLSUFFIX}"
7979
# We override FCOMMON_OPT, so we need to set default integer manually
8080
fflags="$fflags -fdefault-integer-8"
8181
else
82-
interface64_flags=""
82+
interface_flags=""
8383
fi
84+
# XXX uncomment this
85+
# interface_flags="$interface_flags SYMBOLPREFIX=scipy_"
8486

8587
# Build name for output library from gcc version and OpenBLAS commit.
8688
GCC_TAG="gcc_$(gcc -dumpversion | tr .- _)"
@@ -95,17 +97,15 @@ make BINARY=$build_bits DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 \
9597
COMMON_OPT="$cflags" \
9698
FCOMMON_OPT="$fflags" \
9799
MAX_STACK_ALLOC=2048 \
98-
SYMBOLPREFIX="scipy_" \
99-
$interface64_flags
100-
make PREFIX=$openblas_root/$build_bits $interface64_flags \
101-
SYMBOLPREFIX="scipy_" install
100+
$interface_flags
101+
make PREFIX=$openblas_root/$build_bits $interface_flags install
102102
DLL_BASENAME=libscipy_openblas${SYMBOLSUFFIX}_${LIBNAMESUFFIX}
103103

104104
# OpenBLAS does not build a symbol-suffixed static library on Windows:
105105
# do it ourselves
106106
set -x # echo commands
107107
static_libname=$(find . -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a' | tail -1)
108-
make -C exports SYMBOLPREFIX="scipy_" $interface64_flags objcopy.def
108+
make -C exports $interface_flags objcopy.def
109109
objcopy --redefine-syms exports/objcopy.def "${static_libname}" "${static_libname}.renamed"
110110
cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${static_libname}"
111111
cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${DLL_BASENAME}.a"

0 commit comments

Comments
 (0)