diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-30 11:05:03 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-11 07:41:00 +0100 |
| commit | db0f42e77f70f4e9bb3e37bfc6137983ed509855 (patch) | |
| tree | 4396bf63ea58b524c1af64a7b3edd53083cc5597 | |
| parent | fc2e8fb2dc92b9ac0e52fadbc04d75bda9889f06 (diff) | |
| download | px4-firmware-db0f42e77f70f4e9bb3e37bfc6137983ed509855.tar.gz px4-firmware-db0f42e77f70f4e9bb3e37bfc6137983ed509855.tar.bz2 px4-firmware-db0f42e77f70f4e9bb3e37bfc6137983ed509855.zip | |
Dropping GCC 4.7 support
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index a994d3471..f7744344c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,9 @@ before_script: - sudo apt-get install flex bison libncurses5-dev autoconf texinfo build-essential libtool zlib1g-dev genromfs git wget cmake - pushd . - cd ~ - - wget https://launchpadlibrarian.net/174121628/gcc-arm-none-eabi-4_7-2014q2-20140408-linux.tar.bz2 - - tar -jxf gcc-arm-none-eabi-4_7-2014q2-20140408-linux.tar.bz2 - - exportline="export PATH=$HOME/gcc-arm-none-eabi-4_7-2014q2/bin:\$PATH" + - wget https://launchpadlibrarian.net/186124160/gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2 + - tar -jxf gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2 + - exportline="export PATH=$HOME/gcc-arm-none-eabi-4_8-2014q3/bin:\$PATH" - if grep -Fxq "$exportline" ~/.profile; then echo nothing to do ; else echo $exportline >> ~/.profile; fi - . ~/.profile - popd diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index 853885a3b..4c49edaab 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -50,7 +50,7 @@ OBJDUMP = $(CROSSDEV)objdump # Check if the right version of the toolchain is available # -CROSSDEV_VER_SUPPORTED = 4.7.4 4.7.5 4.7.6 4.8.4 4.9.3 +CROSSDEV_VER_SUPPORTED = 4.8.4 4.9.3 CROSSDEV_VER_FOUND = $(shell $(CC) -dumpversion) ifeq (,$(findstring $(CROSSDEV_VER_FOUND), $(CROSSDEV_VER_SUPPORTED))) |