From a6a9928859e2183b44b555d299e0c2c336ad7ccd Mon Sep 17 00:00:00 2001 From: Simon John Date: Tue, 11 Oct 2016 19:59:35 +0100 Subject: Changed the PARSE_BOARD function to handle colons found in things like build.core and build.variant Fixes Issue #461 --- Arduino.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Arduino.mk') diff --git a/Arduino.mk b/Arduino.mk index 133a9a2..1c0debb 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -568,7 +568,7 @@ endif ifndef PARSE_BOARD # result = $(call READ_BOARD_TXT, 'boardname', 'parameter') - PARSE_BOARD = $(shell grep -Ev '^\#' $(BOARDS_TXT) | grep -E "^[ \t]*$(1).$(2)=" | cut -d = -f 2) + PARSE_BOARD = $(shell grep -Ev '^\#' $(BOARDS_TXT) | grep -E "^[ \t]*$(1).$(2)=" | cut -d = -f 2 | cut -d : -f 2) endif # If NO_CORE is set, then we don't have to parse boards.txt file @@ -579,7 +579,7 @@ 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 = $(shell echo $(call PARSE_BOARD,$(BOARD_TAG),build.core) | cut -d : -f 2) + CORE = $(call PARSE_BOARD,$(BOARD_TAG),build.core) $(call show_config_variable,CORE,[COMPUTED],(from build.core)) else $(call show_config_variable,CORE,[USER]) -- cgit v1.2.3