Commit 36207d97 authored by Max Kellermann's avatar Max Kellermann

.travis.yml: add variable MATRIX_EVAL

parent 855d1bc5
...@@ -12,15 +12,20 @@ matrix: ...@@ -12,15 +12,20 @@ matrix:
- g++-5 - g++-5
- libcppunit-dev - libcppunit-dev
- libboost-dev - libboost-dev
env:
- MATRIX_EVAL="export CC=gcc-5 CXX=g++-5"
- os: osx - os: osx
osx_image: xcode9.3beta osx_image: xcode9.3beta
env:
- MATRIX_EVAL=""
env: env:
global: global:
- MAKEFLAGS="-j2" - MAKEFLAGS="-j2"
before_install: before_install:
- eval "${MATRIX_EVAL}"
# C++14 # C++14
- test "$TRAVIS_OS_NAME" != "osx" || brew update - test "$TRAVIS_OS_NAME" != "osx" || brew update
...@@ -30,7 +35,6 @@ install: ...@@ -30,7 +35,6 @@ install:
script: script:
- OPTIONS="--enable-test" - OPTIONS="--enable-test"
- test "$TRAVIS_OS_NAME" != "linux" || export CC=gcc-5 CXX=g++-5
- test "$TRAVIS_OS_NAME" != "osx" || OPTIONS="$OPTIONS --enable-osx" - test "$TRAVIS_OS_NAME" != "osx" || OPTIONS="$OPTIONS --enable-osx"
- ./autogen.sh - ./autogen.sh
- ./configure --disable-silent-rules --disable-dependency-tracking $OPTIONS - ./configure --disable-silent-rules --disable-dependency-tracking $OPTIONS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment