Update build_tarballs.jl

JuliaOpt · Sep 19, 2018 · 05e4cc2 · 05e4cc2
1 parent 6daad24
commit 05e4cc2
Showing 1 changed file with 8 additions and 5 deletions.
diff --git 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