Skip to content

Commit 23556d7

Browse files
authored
Merge pull request #465 from sej7278/master
Changed the PARSE_BOARD function to handle colons
2 parents 299c183 + a6a9928 commit 23556d7

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Arduino.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ endif
568568

569569
ifndef PARSE_BOARD
570570
# result = $(call READ_BOARD_TXT, 'boardname', 'parameter')
571-
PARSE_BOARD = $(shell grep -Ev '^\#' $(BOARDS_TXT) | grep -E "^[ \t]*$(1).$(2)=" | cut -d = -f 2)
571+
PARSE_BOARD = $(shell grep -Ev '^\#' $(BOARDS_TXT) | grep -E "^[ \t]*$(1).$(2)=" | cut -d = -f 2 | cut -d : -f 2)
572572
endif
573573

574574
# If NO_CORE is set, then we don't have to parse boards.txt file
@@ -579,7 +579,7 @@ ifeq ($(strip $(NO_CORE)),)
579579
# 'robot', but can also hold 'tiny', for example, if using
580580
# https://code.google.com/p/arduino-tiny alternate core.
581581
ifndef CORE
582-
CORE = $(shell echo $(call PARSE_BOARD,$(BOARD_TAG),build.core) | cut -d : -f 2)
582+
CORE = $(call PARSE_BOARD,$(BOARD_TAG),build.core)
583583
$(call show_config_variable,CORE,[COMPUTED],(from build.core))
584584
else
585585
$(call show_config_variable,CORE,[USER])

HISTORY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
1010
- Fix: Updated CXXFLAGS_STD to match upstream 1.6 (issue #424) (https://github.com/calvinli)
1111
- Fix: Added support for attiny core's use of chip instead of cpu in submenus (https://github.com/straccio)
1212
- Fix: ARDUINO_VERSION can cope with the longer 1.6.10 version string (issue #444) (https://github.com/sej7278)
13+
- Fix: Changed PARSE_BOARD to handle colons in e.g. CORE or VARIANT (issue #461) (https://github.com/sej7278)
1314
- Tweak: Documentation for Windows updated to include installation of PySerial (https://github.com/sovcik)
1415

1516
### 1.5.1 (Debian version: 1.5-3) (2016-02-22)

0 commit comments

Comments
 (0)