aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabrielius Mickevicius <gabrielius.m@gmail.com>2014-12-30 17:40:15 +0200
committerGabrielius Mickevicius <gabrielius.m@gmail.com>2014-12-30 17:45:36 +0200
commite639f81b6c52b2092a4682cdc93efe5832c3e879 (patch)
tree87a9b7048905330f506a150d593500c393a07bae
parentde602e8b616469652731515adcdcd64794805670 (diff)
Fix build.core parsing
Disregard anything before first colon. E.g. build.core = arduino:arduino results in CORE = arduino Print CORE.
-rw-r--r--Arduino.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 8c878a4..a5b9bba 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -563,7 +563,10 @@ ifeq ($(strip $(NO_CORE)),)
# 'robot', but can also hold 'tiny', for example, if using
# https://code.google.com/p/arduino-tiny alternate core.
ifndef CORE
- CORE = $(call PARSE_BOARD,$(BOARD_TAG),build.core)
+ CORE = $(shell echo $(call PARSE_BOARD,$(BOARD_TAG),build.core) | cut -d : -f 2)
+ $(call show_config_variable,CORE,[COMPUTED],(from build.core))
+ else
+ $(call show_config_variable,CORE,[USER])
endif
# Which variant ? This affects the include path