masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix variable name clash with builtin 

This caused the submake to be called several times, messing up the
build.
This commit is contained in:
Fred Sundvik 2016-08-11 09:34:23 +03:00
parent 8732265928
commit d924eb591e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -240,13 +240,13 @@ define PARSE_KEYMAP
KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM)
MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
MAKE_COMMAND := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk
MAKE_MSG := Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR) MAKE_MSG := Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR)
MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}' MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}'
COMMAND_true_$$(COMMAND) := \ COMMAND_true_$$(COMMAND) := \
printf "$$(MAKE_MSG)" | \ printf "$$(MAKE_MSG)" | \
$$(MAKE_MSG_FORMAT); \ $$(MAKE_MSG_FORMAT); \
LOG=$$$$($$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=true 2>&1) ; \ LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \
if [ $$$$? -gt 0 ]; \ if [ $$$$? -gt 0 ]; \
then $$(PRINT_ERROR_PLAIN); \ then $$(PRINT_ERROR_PLAIN); \
elif [ "$$$$LOG" != "" ] ; \ elif [ "$$$$LOG" != "" ] ; \
@ -257,7 +257,7 @@ define PARSE_KEYMAP
COMMAND_false_$$(COMMAND) := \ COMMAND_false_$$(COMMAND) := \
printf "$$(MAKE_MSG)\n" | \ printf "$$(MAKE_MSG)\n" | \
$$(MAKE_MSG_FORMAT); \ $$(MAKE_MSG_FORMAT); \
$$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=false; $$(MAKE_CMD) $$(MAKE_VARS) SILENT=false;
endef endef
define PARSE_ALL_KEYMAPS define PARSE_ALL_KEYMAPS