set travis to use gcc 4.6 again

This commit is contained in:
Chris Beck 2014-07-22 15:41:03 -04:00
parent b548a90c65
commit 90ca3e7026

View file

@ -28,13 +28,13 @@ before_install:
- if [ "$CXX" = "g++" ]; then export WML_TESTS=false; fi
- if [ "$CXX" = "g++" ]; then export PLAY_TEST=false; fi
- if [ "$CXX" = "g++" ]; then export CHECK_UTF8=false; fi
- if [ "$CXX" = "g++" ]; then time sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
# - if [ "$CXX" = "g++" ]; then time sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
install:
- time sudo apt-get update -qq
- time sudo apt-get install -qq libboost-iostreams-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb
- if [ "$CXX" = "g++" ]; then time sudo apt-get install g++-4.8; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
# - if [ "$CXX" = "g++" ]; then time sudo apt-get install g++-4.8; fi
# - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
- if [ "$CHECK_UTF8" = true ]; then time sudo apt-get install -qq moreutils; fi
script: