Commit 5df6758 1 parent 7750d46 commit 5df6758 Copy full SHA for 5df6758
File tree 2 files changed +3
-4
lines changed
2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -76,8 +76,8 @@ before_install:
76
76
brew tap staticfloat/julia > /dev/null;
77
77
brew rm --force $(brew deps --HEAD julia);
78
78
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";
81
81
BUILDOPTS="$BUILDOPTS VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1";
82
82
BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas";
83
83
for lib in SUITESPARSE BLAS LAPACK GMP MPFR LIBUNWIND; do
Original file line number Diff line number Diff line change @@ -45,15 +45,13 @@ if [ "$ARCH" = x86_64 ]; then
45
45
echo ' USE_BLAS64 = 1' >> Make.user
46
46
echo ' LIBBLAS = -L$(JULIAHOME)/usr/bin -lopenblas64_' >> Make.user
47
47
echo ' LIBBLASNAME = libopenblas64_' >> Make.user
48
- echo ' BINARYBUILDER_TRIPLET = x86_64-w64-mingw32' >> Make.user
49
48
else
50
49
bits=32
51
50
archsuffix=86
52
51
exc=sjlj
53
52
echo " override MARCH = pentium4" >> Make.user
54
53
echo ' LIBBLAS = -L$(JULIAHOME)/usr/bin -lopenblas' >> Make.user
55
54
echo ' LIBBLASNAME = libopenblas' >> Make.user
56
- echo ' BINARYBUILDER_TRIPLET = i686-w64-mingw32' >> Make.user
57
55
fi
58
56
echo " override JULIA_CPU_TARGET=generic;native" >> Make.user
59
57
@@ -198,6 +196,7 @@ if [ -n "$USEMSVC" ]; then
198
196
else
199
197
# Use BinaryBuilder
200
198
echo ' USE_BINARYBUILDER_LLVM = 1' >> Make.user
199
+ echo ' USE_BINARYBUILDER_OPENBLAS = 1' >> Make.user
201
200
echo ' BINARYBUILDER_LLVM_ASSERTS = 1' >> Make.user
202
201
echo ' override DEP_LIBS += llvm openlibm' >> Make.user
203
202
export CCACHE_DIR=/cygdrive/c/ccache
You can’t perform that action at this time.
0 commit comments