From c0c9dcfdd412d2579e79a37aa194ec41eb8fa107 Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Fri, 8 Feb 2019 13:16:45 +0900 Subject: [PATCH] Simplify OSX configuration --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 623f271f2225b..fb2510add636e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,10 +75,10 @@ before_install: contrib/travis_fastfail.sh || exit 1; brew rm --force gcc gmp mpfr pcre2; brew install -v gcc gmp mpfr pcre2; - BUILDOPTS="-j3 USECLANG=1 USECCACHE=1 USE_BINARYBUILDER_LLVM=1 USE_BINARYBUILDER_OPENBLAS=1 USE_BINARYBUILDER_SUITESPARSE=1 BINARYBUILDER_LLVM_ASSERTS=1"; - BUILDOPTS="$BUILDOPTS LLVM_CONFIG=$TRAVIS_BUILD_DIR/usr/tools/llvm-config LLVM_SIZE=$TRAVIS_BUILD_DIR/usr/tools/llvm-size"; - BUILDOPTS="$BUILDOPTS VERBOSE=1 USE_BLAS64=0 FORCE_ASSERTIONS=1"; - BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas"; + BUILDOPTS="-j3 USECLANG=1 USECCACHE=1 VERBOS=1 FORCE_ASSERTIONS=1"; + for proj in LLVM LLVM_ASSERTS OPENBLAS SUITESPARSE; do + BUILDOPTS="$BUILDOPTS USE_BINARYBUILDER_${proj}=1"; + done; for lib in GMP MPFR LIBUNWIND; do BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done;