jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Travis gcc version refactor

Browse source 
Use GCC env variable to hold gcc version to install instead of SWIG_CC
and SWIG_CXX.
This commit is contained in:
William S Fulton 2019-05-02 07:56:42 +01:00
commit 48e61eea1d
3 changed files with 29 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Tools/travis-linux-install.sh
View file

@ -1,26 +1,16 @@
#!/bin/bash
# Install Linux packages where the version has been overidden in .travis.yml
set -e # exit on failure (same as -o errexit)
lsb_release -a
travis_retry sudo apt-get -qq update
if [[ "$CC" == gcc-5 ]]; then
if [[ -n "$GCC" ]]; then
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
travis_retry sudo apt-get -qq update
travis_retry sudo apt-get install -qq g++-5
elif [[ "$CC" == gcc-6 ]]; then
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
travis_retry sudo apt-get -qq update
travis_retry sudo apt-get install -qq g++-6
elif [[ "$CC" == gcc-7 ]]; then
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
travis_retry sudo apt-get -qq update
travis_retry sudo apt-get install -qq g++-7
elif [[ "$CC" == gcc-8 ]]; then
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
travis_retry sudo apt-get -qq update
travis_retry sudo apt-get install -qq g++-8
travis_retry sudo apt-get install -qq g++-$GCC
fi
travis_retry sudo apt-get -qq install libboost-dev

2
Tools/travis-osx-install.sh
View file

@ -1,5 +1,7 @@
#!/bin/bash
# Install MacOS packages where the version has been overidden in .travis.yml
set -e # exit on failure (same as -o errexit)
sw_vers