From d27ceb75dd327ea8a685155a285cbffcafda380a Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 1 May 2016 11:32:28 -0700 Subject: [PATCH] Travis fix --- .travis.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec7c2c1b..fbea43db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,18 +9,6 @@ matrix: osx_image: xcode7.2 compiler: gcc env: VERSION=-5 - - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - libmpfr-dev - - libgmp-dev - - libmpc-dev - - binutils-dev - env: VERSION=-4.8 - compiler: gcc addons: apt: @@ -75,16 +63,17 @@ matrix: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libmpc; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; fi - + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; f + install: - export CC=$CC$VERSION - export CXX=$CXX$VERSION + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LDFLAGS='-L/usr/local/lib'; fi script: - ./scripts/reconfigure_script - mkdir build - cd build - - ../configure CXXFLAGS="-mavx -mfma -O3 -std=c++11" LIBS="-fopenmp -lmpfr -lgmp" --enable-precision=single --enable-simd=AVX --enable-comms=none + - ../configure CXXFLAGS="-msse4.2 -O3 -std=c++11" LIBS="-lmpfr -lgmp" --enable-precision=single --enable-simd=SSE4 --enable-comms=none - make -j4 - ./benchmarks/Benchmark_dwf --threads 1