diff options
| author | Sudar Muthu <sudar@sudarmuthu.com> | 2019-06-03 11:52:05 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 11:52:05 +0530 |
| commit | 3817dbeb2847cb33173063c6d4488bfdc18aafbb (patch) | |
| tree | 313ae6cc02cc7e5db073777f420a00ff743d0a3a | |
| parent | 8c85ca7001580a04438490332c7b4e0418856d94 (diff) | |
| parent | 6cf275f0e72f28e95735de0e8295caf62f537b83 (diff) | |
Merge pull request #604 from stv0g/fix-issue-601
Fix regression: PARSE_BOARD chops off flags which contain '=' signs
| -rw-r--r-- | Common.mk | 4 | ||||
| -rw-r--r-- | Sam.mk | 5 |
2 files changed, 1 insertions, 8 deletions
@@ -5,16 +5,14 @@ COMMON_INCLUDED = TRUE # (directory and optional filename) exists dir_if_exists = $(if $(wildcard $(1)$(2)),$(1)) -ifndef PARSE_BOARD # result = $(call READ_BOARD_TXT, 'boardname', 'parameter') PARSE_BOARD = $(shell if [ -f $(BOARDS_TXT) ]; \ then \ grep -Ev '^\#' $(BOARDS_TXT) | \ grep -E "^[ \t]*$(1).$(2)=" | \ - cut -d = -f 2 | \ + cut -d = -f 2- | \ cut -d : -f 2; \ fi) -endif # Run a shell script if it exists. Stops make on error. runscript_if_exists = \ @@ -130,11 +130,6 @@ CPPFLAGS += -I$(CMSIS_ATMEL_DIR)/Device/ATMEL LIB_PATH = $(CMSIS_DIR)/Lib/GCC BOOTLOADER_PARENT = $(ALTERNATE_CORE_PATH)/bootloaders -# Utility from ard-mk to parse boards.txt for flags -ifndef PARSE_BOARD - PARSE_BOARD = $(shell grep -Ev '^\#' $(BOARDS_TXT) | grep -E '^[ \t]*$(1).$(2)=' | cut -d = -f 2 | cut -d : -f 2) -endif - ifndef VARIANT VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.variant) ifndef VARIANT |