Skip to content

Commit 31de412

Browse files
authored
Merge pull request #11 from pv/fix-dll-def
Fix openblas msvc export library generation
2 parents 4382c9e + 1dcd674 commit 31de412

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

appveyor/build_gfortran.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Build gfortran binary against OpenBLAS
2+
3+
set -e
4+
25
cd $(cygpath "$START_DIR")
36
OBP=$(cygpath $OPENBLAS_ROOT\\$BUILD_BITS)
47

appveyor/build_openblas.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# BUILD_BITS
77
# VC9_ROOT
88

9+
set -e
10+
911
# Paths in Unix format
1012
OPENBLAS_ROOT=$(cygpath "$OPENBLAS_ROOT")
1113
VC9_ROOT=$(cygpath "$VC9_ROOT")
@@ -88,11 +90,7 @@ cd $BUILD_BITS/lib
8890
# At least for the mingwpy wheel, we have to use the VC tools to build the
8991
# export library. Maybe fixed in later binutils by patch referred to in
9092
# https://sourceware.org/ml/binutils/2016-02/msg00002.html
91-
if [ "$INTERFACE64" == "1" ]; then
92-
cp ${our_wd}/OpenBLAS/exports/${DLL_BASENAME}.def ${DLL_BASENAME}.def
93-
else
94-
cp ${our_wd}/OpenBLAS/exports/libopenblas.def ${DLL_BASENAME}.def
95-
fi
93+
cp ${our_wd}/OpenBLAS/exports/${DLL_BASENAME}.def ${DLL_BASENAME}.def
9694
"$VC9_ROOT/bin/lib.exe" /machine:${vc_arch} /def:${DLL_BASENAME}.def
9795
cd ../..
9896
# Build template site.cfg for using this build

0 commit comments

Comments
 (0)