Skip to content

Commit 5df6758

Browse files
committed
Tell Appveyor and Travis to use BinaryBuilder OpenBLAS
Also allow the build system to auto-guess the triplet
1 parent 7750d46 commit 5df6758

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ before_install:
7676
brew tap staticfloat/julia > /dev/null;
7777
brew rm --force $(brew deps --HEAD julia);
7878
brew install -v ccache gcc gmp mpfr pcre2 staticfloat/julia/openblas-julia staticfloat/julia/suite-sparse-julia staticfloat/juliadeps/libgfortran;
79-
BUILDOPTS="-j3 USECLANG=1 USECCACHE=1 BINARYBUILDER_TRIPLET=x86_64-apple-darwin14 BINARYBUILDER_LLVM_ASSERTS=1";
80-
BUILDOPTS="$BUILDOPTS USE_BINARYBUILDER_LLVM=1 LLVM_CONFIG=$TRAVIS_BUILD_DIR/usr/tools/llvm-config LLVM_SIZE=$TRAVIS_BUILD_DIR/usr/tools/llvm-size";
79+
BUILDOPTS="-j3 USECLANG=1 USECCACHE=1 USE_BINARYBUILDER_LLVM=1 USE_BINARYBUILDER_OPENBLAS=1 BINARYBUILDER_LLVM_ASSERTS=1";
80+
BUILDOPTS="$BUILDOPTS LLVM_CONFIG=$TRAVIS_BUILD_DIR/usr/tools/llvm-config LLVM_SIZE=$TRAVIS_BUILD_DIR/usr/tools/llvm-size";
8181
BUILDOPTS="$BUILDOPTS VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1";
8282
BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas";
8383
for lib in SUITESPARSE BLAS LAPACK GMP MPFR LIBUNWIND; do

contrib/windows/appveyor_build.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,13 @@ if [ "$ARCH" = x86_64 ]; then
4545
echo 'USE_BLAS64 = 1' >> Make.user
4646
echo 'LIBBLAS = -L$(JULIAHOME)/usr/bin -lopenblas64_' >> Make.user
4747
echo 'LIBBLASNAME = libopenblas64_' >> Make.user
48-
echo 'BINARYBUILDER_TRIPLET = x86_64-w64-mingw32' >> Make.user
4948
else
5049
bits=32
5150
archsuffix=86
5251
exc=sjlj
5352
echo "override MARCH = pentium4" >> Make.user
5453
echo 'LIBBLAS = -L$(JULIAHOME)/usr/bin -lopenblas' >> Make.user
5554
echo 'LIBBLASNAME = libopenblas' >> Make.user
56-
echo 'BINARYBUILDER_TRIPLET = i686-w64-mingw32' >> Make.user
5755
fi
5856
echo "override JULIA_CPU_TARGET=generic;native" >> Make.user
5957

@@ -198,6 +196,7 @@ if [ -n "$USEMSVC" ]; then
198196
else
199197
# Use BinaryBuilder
200198
echo 'USE_BINARYBUILDER_LLVM = 1' >> Make.user
199+
echo 'USE_BINARYBUILDER_OPENBLAS = 1' >> Make.user
201200
echo 'BINARYBUILDER_LLVM_ASSERTS = 1' >> Make.user
202201
echo 'override DEP_LIBS += llvm openlibm' >> Make.user
203202
export CCACHE_DIR=/cygdrive/c/ccache

0 commit comments

Comments
 (0)