Commit a80ac7b7502d3a255fbfc5c33da1c6da53db0ba6
1 parent
a99b6a33
Trying to set CC and CXX
Showing
1 changed file
with
3 additions
and
6 deletions
.travis.yml
| ... | ... | @@ -14,9 +14,7 @@ matrix: |
| 14 | 14 | - ubuntu-toolchain-r-test |
| 15 | 15 | packages: |
| 16 | 16 | - g++-4.9 |
| 17 | - env: | |
| 18 | - - CC=gcc-4.8 | |
| 19 | - - CXX=g++-4.8 | |
| 17 | + env: COMPILER=4.9 | |
| 20 | 18 | - compiler: gcc |
| 21 | 19 | addons: |
| 22 | 20 | apt: |
| ... | ... | @@ -24,9 +22,7 @@ matrix: |
| 24 | 22 | - ubuntu-toolchain-r-test |
| 25 | 23 | packages: |
| 26 | 24 | - g++-4.8 |
| 27 | - env: | |
| 28 | - - CC=gcc-4.8 | |
| 29 | - - CXX=g++-4.8 | |
| 25 | + env: COMPILER=4.8 | |
| 30 | 26 | - compiler: clang |
| 31 | 27 | addons: |
| 32 | 28 | apt: |
| ... | ... | @@ -37,6 +33,7 @@ matrix: |
| 37 | 33 | - clang-3.6 |
| 38 | 34 | |
| 39 | 35 | install: |
| 36 | + - if [ "$CXX" = "g++" ]; then export CXX="g++-$COMPILER" CC="gcc-$COMPILER"; fi | |
| 40 | 37 | - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" |
| 41 | 38 | - CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" |
| 42 | 39 | - cd "${DEPS_DIR}" | ... | ... |