diff options
| author | Simon John <git@the-jedi.co.uk> | 2016-10-12 00:11:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 00:11:49 +0100 |
| commit | 23556d759cfaf94b7ed4a996f177412833e55387 (patch) | |
| tree | d3771e7d771bae3791eca7e26e31eadd67d95113 /Arduino.mk | |
| parent | 299c1831cc38f1ee027fb5d9f84d7a8d3f7288f3 (diff) | |
| parent | a6a9928859e2183b44b555d299e0c2c336ad7ccd (diff) | |
Merge pull request #465 from sej7278/master
Changed the PARSE_BOARD function to handle colons
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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]) |