diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-07-28 22:32:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-28 22:32:37 +0200 |
| commit | 16f8426fe273465fb192277c1108d3d76abbb6f5 (patch) | |
| tree | d2b16742eb086512ae933751c2d6932659a02a31 /tmk_core | |
| parent | 80667e898a17dfae86189d9f5f7dfcc9c7a08eea (diff) | |
| parent | dd770547909ff0bbc391fbf38493cbd08285fb4c (diff) | |
| download | qmk_firmware-16f8426fe273465fb192277c1108d3d76abbb6f5.tar.gz qmk_firmware-16f8426fe273465fb192277c1108d3d76abbb6f5.tar.xz | |
Merge pull request #573 from algernon/f/make-all-stop-on-error
tmk_core/rules.mk: Make PRINT_ERROR* stop on error
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/rules.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index f13351ea1..2bf2a109f 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -60,9 +60,9 @@ TAB_LOG = printf "\n$$LOG\n\n" | $(AWK) '{ sub(/^/," | "); print }' TAB_LOG_PLAIN = printf "$$LOG\n" AWK_STATUS = $(AWK) '{ printf " %-10s\n", $$1; }' AWK_CMD = $(AWK) '{ printf "%-99s", $$0; }' -PRINT_ERROR = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) && false +PRINT_ERROR = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) && exit 1 PRINT_WARNING = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) -PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) && false && break +PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) && exit 1 PRINT_WARNING_PLAIN = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) PRINT_OK = $(SILENT) || printf " $(OK_STRING)" | $(AWK_STATUS) BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING); else $(PRINT_OK); fi; |