Travis CI: Next attempt at GCC fix

This commit is contained in:
Lorenz Meier
2016-01-09 02:07:27 +01:00
parent c17466ffee
commit 501ad87dd2
+3 -1
View File
@@ -27,6 +27,8 @@ addons:
- ccache - ccache
- clang-3.5 - clang-3.5
- cmake - cmake
- g++-4.9
- gcc-4.9
- genromfs - genromfs
- libc6-i386 - libc6-i386
- libncurses5-dev - libncurses5-dev
@@ -53,7 +55,7 @@ before_install:
&& mkdir -p ~/bin && mkdir -p ~/bin
&& wget -O ~/bin/astyle https://github.com/PX4/astyle/releases/download/2.05.1/astyle-linux && chmod +x ~/bin/astyle && wget -O ~/bin/astyle https://github.com/PX4/astyle/releases/download/2.05.1/astyle-linux && chmod +x ~/bin/astyle
&& astyle --version && astyle --version
&& if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi && if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
; ;
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
brew tap PX4/homebrew-px4 brew tap PX4/homebrew-px4