diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-08-09 23:17:48 -0400 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-08-09 23:17:48 -0400 |
| commit | 48a89ad8649ffe5fa054eccf1b0498f8a0a49b32 (patch) | |
| tree | 507acee914061af992dd8d657b2374da544c47ae /Makefile | |
| parent | 597ff7aee9a04b4f4f41d6d1f5b2e1223e0e83b8 (diff) | |
| parent | a5ab2412ab6bb4df9be121faa8caaf900dc0ba0d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -390,6 +390,7 @@ endef define BUILD MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) COMMANDS += $$(COMMAND) + MAKE_MSG = QMK Firmware v$$(shell git describe --abbrev=0 --tags 2>/dev/null)\n\n$(MAKE_MSG) COMMAND_true_$$(COMMAND) := \ printf "$$(MAKE_MSG)" | \ $$(MAKE_MSG_FORMAT); \ @@ -420,7 +421,7 @@ define BUILD_TEST COMMAND := $1 MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET) MAKE_VARS := TEST=$$(TEST_NAME) FULL_TESTS="$$(FULL_TESTS)" - MAKE_MSG := $$(MSG_MAKE_TEST) + MAKE_MSG := QMK Firmware v$$(shell git describe --abbrev=0 --tags 2>/dev/null)\n\n$$(MSG_MAKE_TEST) $$(eval $$(call BUILD)) ifneq ($$(MAKE_TARGET),clean) TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf |