Skip to content
This repository was archived by the owner on Apr 6, 2019. It is now read-only.

Commit 4fc6670

Browse files
committed
remove g++4.8 from travis on macos as the installation is broken and conflicting with pre-installed c++ versions..
1 parent 9312f97 commit 4fc6670

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ addons:
2424

2525
before_install:
2626
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
27-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc48 --enable-cxx; fi
2827
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install llvm --with-clang; fi
2928

3029
install:
3130
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi
3231
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi
33-
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
32+
- if [[ "$TRAVIS_OS_NAME" != "osx" && "$CXX" = "g++" ]]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
3433
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install redis; fi
3534
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then (redis-server&); fi
3635

0 commit comments

Comments
 (0)