mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-27 10:17:45 +08:00
Travis CI: Next attempt at GCC fix
This commit is contained in:
+3
-1
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user