From 05e4cc2c82bd88ef94298be9efb4399ad20f375c Mon Sep 17 00:00:00 2001 From: Juan Pablo Vielma Date: Wed, 19 Sep 2018 18:56:06 -0400 Subject: [PATCH] Update build_tarballs.jl --- build_tarballs.jl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build_tarballs.jl b/build_tarballs.jl index d752cd7..35603cd 100644 --- a/build_tarballs.jl +++ b/build_tarballs.jl @@ -18,11 +18,14 @@ script = raw""" cd $WORKSPACE/srcdir cd scs-2.0.2/ # Mac OS and Windows do not have openmp by default -if [ $target = "x86_64-apple-darwin14" ] || [ $target = "x86_64-w64-mingw32" ] || [ $target = "i686-w64-mingw32" ]; then - flags="DLONG=1" -else - flags="DLONG=1 USE_OPENMP=1" -fi +#if [ $target = "x86_64-apple-darwin14" ] || [ $target = "x86_64-w64-mingw32" ] || [ $target = "i686-w64-mingw32" ]; then +# flags="DLONG=1" +#else +# flags="DLONG=1 USE_OPENMP=1" +#fi +# GOMP 4.0 would be required for OPENMP, which makes travis fail because it only has gcc version 4.8.4 +USE_OPENMP=0 +DLONG=1 if [ $target = "x86_64-apple-darwin14" ]; then install_name_tool -id libopenblas64_.dylib ${prefix}/lib/libopenblas64_.0.3.0.dev.dylib fi