diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-15 10:55:49 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-15 10:55:49 +0100 |
| commit | ad1d62582e3dcdb2e39de9ced4acbc726e074682 (patch) | |
| tree | 475f7f6a166a374e5adff91a0c28a750f1ddb3de /.travis.yml | |
| parent | 92101304e784507b7b47858e565d666eca37260a (diff) | |
| download | dabmux-ad1d62582e3dcdb2e39de9ced4acbc726e074682.tar.gz dabmux-ad1d62582e3dcdb2e39de9ced4acbc726e074682.tar.bz2 dabmux-ad1d62582e3dcdb2e39de9ced4acbc726e074682.zip | |
Properly set Travis flags
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index d04c26a..21f825c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,13 @@ language: c++ matrix: include: # Clang on OSX - - env: CC=clang CXX=clang++ CONF= + - env: MATRIX_EVAL="" CONF="" os: osx osx_image: xcode9.1 compiler: clang # GCC and clang builds on Linux - - env: CC=gcc-6 CXX=g++-6 CONF=--disable-output-edi + - env: MATRIX_EVAL="CC=gcc-6 CXX=g++-6" CONF="--disable-output-edi" os: linux dist: trusty sudo: required @@ -27,15 +27,15 @@ matrix: - libcurl4-openssl-dev - g++-6 - - env: CC=gcc-6 CXX=g++-6 CONF=--enable-output-raw + - env: MATRIX_EVAL="CC=gcc-6 CXX=g++-6" CONF="--enable-output-raw" compiler: gcc addons: *linuxaddons - - env: CC=gcc-6 CXX=g++-6 CONF= + - env: MATRIX_EVAL="CC=gcc-6 CXX=g++-6" CONF="" compiler: gcc addons: *linuxaddons - - env: CC=clang-4.0 CXX=clang++-4.0 CONF=--enable-output-raw + - env: MATRIX_EVAL="" CONF="--enable-output-raw" compiler: clang addons: &linuxclang40 apt: @@ -52,6 +52,7 @@ matrix: - clang-4.0 before_install: + - eval "${MATRIX_EVAL}" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install boost zeromq automake curl ; fi |