fabi/Snappy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Travis CI configuration for OSX.

Browse Source
This commit is contained in:
costan
2018-01-04 14:26:40 -08:00
committed by Victor Costan
parent 4aba5426d4
commit e69d9f8806
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.travis.yml
View File

@@ -38,10 +38,17 @@ addons:
- clang-4.0 - clang-4.0
install: install:
# Travis doesn't have a nice way to install homebrew packages yet. # Travis doesn't have a DSL for installing homebrew packages yet. Status tracked
# https://github.com/travis-ci/travis-ci/issues/5377 # in https://github.com/travis-ci/travis-ci/issues/5377
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi # The Travis VM image for Mac already has a link at /usr/local/include/c++,
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install gcc@6; fi # causing Homebrew's gcc@6 installation to error out. This was reported to
# Homebrew maintainers at https://github.com/Homebrew/brew/issues/1742 and
# removing the link emerged as a workaround.
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update;
if [ -L /usr/local/include/c++ ]; then rm /usr/local/include/c++; fi;
brew install gcc@6;
fi
# /usr/bin/gcc is stuck to old versions by on both Linux and OSX. # /usr/bin/gcc is stuck to old versions by on both Linux and OSX.
- if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
- echo ${CC} - echo ${CC}