diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-12 09:03:50 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-17 15:14:17 +0100 |
| commit | 97a1410ec99e880207e4ee6d2a03451c2e11f4cf (patch) | |
| tree | c8523994a348f9aa64afca843dc680fcf79fdd26 /makefiles | |
| parent | 41fe04776f362cf9f0fae6451550df8d5eaf8d99 (diff) | |
| download | px4-firmware-97a1410ec99e880207e4ee6d2a03451c2e11f4cf.tar.gz px4-firmware-97a1410ec99e880207e4ee6d2a03451c2e11f4cf.tar.bz2 px4-firmware-97a1410ec99e880207e4ee6d2a03451c2e11f4cf.zip | |
Toolchain: Allow GCC 4.7 and 4.8 variants
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index 71c7fb49f..84e5cd08a 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -50,11 +50,11 @@ OBJDUMP = $(CROSSDEV)objdump # Check if the right version of the toolchain is available # -CROSSDEV_VER_SUPPORTED = 4.7 +CROSSDEV_VER_SUPPORTED = 4.7.4 4.7.5 4.7.6 4.8.4 CROSSDEV_VER_FOUND = $(shell $(CC) -dumpversion) -ifeq (,$(findstring $(CROSSDEV_VER_SUPPORTED),$(CROSSDEV_VER_FOUND))) -$(error Unsupported version of $(CC), found: $(CROSSDEV_VER_FOUND) instead of $(CROSSDEV_VER_SUPPORTED).x) +ifeq (,$(findstring $(CROSSDEV_VER_FOUND), $(CROSSDEV_VER_SUPPORTED))) +$(error Unsupported version of $(CC), found: $(CROSSDEV_VER_FOUND) instead of one in: $(CROSSDEV_VER_SUPPORTED)) endif |