diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2018-11-23 10:41:38 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@linux.ibm.com> | 2018-11-23 15:03:05 +1100 |
| commit | 83b7372b29d1a230554b530067d7ed3f38d16e02 (patch) | |
| tree | 823537040d92a71ea1320276a9093fd36193db03 /.travis.compiler.sh | |
| parent | 46a411088c5abbacda4e52e89f4dbcf52a451f7a (diff) | |
| download | mariadb-git-83b7372b29d1a230554b530067d7ed3f38d16e02.tar.gz | |
travis: update CC_VERSIONS to 6 and 7
Use clang-6,7 too.
Diffstat (limited to '.travis.compiler.sh')
| -rwxr-xr-x | .travis.compiler.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.travis.compiler.sh b/.travis.compiler.sh index 6b8de374219..558bded8579 100755 --- a/.travis.compiler.sh +++ b/.travis.compiler.sh @@ -25,12 +25,17 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then ccache --max-size=2200M fi if [[ "${CXX}" == 'clang++' ]]; then - export CXX CC=${CXX/++/} + if [[ "${CC_VERSION}" == '6' ]]; then + export CXX=${CXX}-${CC_VERSION}.0 + else + export CXX=${CXX}-${CC_VERSION} + fi + export CC=${CXX/++/} elif [[ "${CXX}" == 'g++' ]]; then export CXX=g++-${CC_VERSION} export CC=gcc-${CC_VERSION} fi - if [[ ${CC_VERSION} == 6 ]]; then + if [[ ${CC_VERSION} == 7 ]]; then wget http://mirrors.kernel.org/ubuntu/pool/universe/p/percona-xtradb-cluster-galera-2.x/percona-xtradb-cluster-galera-2.x_165-0ubuntu1_amd64.deb ; ar vx percona-xtradb-cluster-galera-2.x_165-0ubuntu1_amd64.deb tar -xJvf data.tar.xz |