summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-05-21 11:31:05 -0700
committerKeith Packard <keithp@keithp.com>2013-05-21 11:31:05 -0700
commit2344ba81fa51215471099e56518112478bdf2e73 (patch)
tree4273f2461db78c2341cf8679ed68f35564aac83f /src
parent85eb75c3251d8e141d7269fc7ffa6197174ea8c3 (diff)
Separate out cortex-m0 compiler tests in configure
The summon arm toolchain doesn't work for cortex-m0 parts, but the linaro toolchain does. Look in /usr/bin for the -m0 compiler but continue to use /opt/cortex/bin for the -m3 compiler Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 5851b2a8..7ffc52d6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,7 +35,9 @@ ARMDIRS=\
telegps-v0.1 telegps-v0.1/flash-loader \
stm-bringup stm-demo \
telelco-v0.2 telelco-v0.2/flash-loader \
- telescience-v0.2 telescience-v0.2/flash-loader \
+ telescience-v0.2 telescience-v0.2/flash-loader
+
+ARMM0DIRS=\
easymini-v0.1
ifneq ($(shell which sdcc),)
@@ -46,10 +48,14 @@ ifneq ($(shell which avr-gcc),)
SUBDIRS += $(AVRDIRS)
endif
-ifneq ($(shell which arm-none-eabi-gcc),)
+ifneq ($(shell which /opt/cortex/bin/arm-none-eabi-gcc),)
SUBDIRS += $(ARMDIRS)
endif
+ifneq ($(shell which /usr/bin/arm-none-eabi-gcc),)
+ SUBDIRS += $(ARMM0DIRS)
+endif
+
ALLDIRS=$(SDCCDIRS) $(AVRDIRS) $(ARMDIRS)
all: all-local all-recursive