Merge pull request #354 from libretro/before_install

Use Travis matrix for before_install
This commit is contained in:
Rob Loach 2018-12-22 13:46:46 -05:00 committed by GitHub
commit 82965c4218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,16 +6,16 @@ matrix:
- os: linux
dist: trusty
sudo: required
before_install:
- sudo apt-get -qq update
- sudo apt-get install g++-7 binutils-2.26
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90
- export PATH=/usr/lib/binutils-2.26/bin:${PATH}
- os: osx
osx_image: xcode8.3
before_install:
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo apt-get -qq update ; fi
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo apt-get install g++-7 binutils-2.26 ; fi
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90 ; fi
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90 ; fi
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then export PATH=/usr/lib/binutils-2.26/bin:${PATH} ; fi
addons:
apt:
sources: