diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-21 03:34:28 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-21 03:38:38 -0800 |
commit | 9125863ac0dd00aef1a7b52ca65fff373481ac40 (patch) | |
tree | 68551605916d34fc541ecc559620ad22ac437f68 | |
parent | af81dcfc2c23b9a931bee55544e32da30eb4874c (diff) | |
download | protobuf-9125863ac0dd00aef1a7b52ca65fff373481ac40.tar.gz protobuf-9125863ac0dd00aef1a7b52ca65fff373481ac40.tar.bz2 protobuf-9125863ac0dd00aef1a7b52ca65fff373481ac40.zip |
Only try to install GCC 4.8 on Linux.
-rwxr-xr-x | travis.sh | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -11,12 +11,14 @@ # For when some other test needs the C++ main build, including protoc and # libprotobuf. internal_build_cpp() { - # Install GCC 4.8 to replace the default GCC 4.6. We need 4.8 for more - # decent C++ 11 support in order to compile conformance tests. - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -qq - sudo apt-get install -qq g++-4.8 - export CXX="g++-4.8" CC="gcc-4.8" + if [ $(uname -s) == "Linux" ]; then + # Install GCC 4.8 to replace the default GCC 4.6. We need 4.8 for more + # decent C++ 11 support in order to compile conformance tests. + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt-get update -qq + sudo apt-get install -qq g++-4.8 + export CXX="g++-4.8" CC="gcc-4.8" + fi ./autogen.sh ./configure |