Commit f9e0c5ec authored by Stefan Behnel's avatar Stefan Behnel

Try to simplify the way gcc-8/g++-8 are installed.

parent 2ef0ccd6
...@@ -6,13 +6,14 @@ addons: ...@@ -6,13 +6,14 @@ addons:
apt: apt:
sources: sources:
- sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:ubuntu-toolchain-r/test'
update: true
packages: packages:
- gdb - gdb
- python-dbg - python-dbg
- python3-dbg - python3-dbg
- libzmq-dev # needed by IPython/Tornado - libzmq-dev # needed by IPython/Tornado
#- gcc-8 - gcc-8
#- g++-8 - g++-8
cache: cache:
pip: true pip: true
...@@ -111,8 +112,6 @@ branches: ...@@ -111,8 +112,6 @@ branches:
before_install: before_install:
- | - |
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo apt-get update
sudo apt-get install gcc-8 $(if [ "$BACKEND" = cpp ]; then echo -n "g++-8"; fi )
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60
sudo update-alternatives --set gcc /usr/bin/gcc-8 sudo update-alternatives --set gcc /usr/bin/gcc-8
export CC="ccache gcc-8" export CC="ccache gcc-8"
......
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