summaryrefslogtreecommitdiff
path: root/builddefs
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-02-05 12:32:31 +1100
committerGitHub <noreply@github.com>2022-02-04 17:32:31 -0800
commite987ce16525137efb50ce02a6552384851b49f88 (patch)
tree7d884608e7913d8f4c95c088d4fa6c7108c3aeef /builddefs
parent45406c0ca2649a16e28ce1020adb5fb8588220ca (diff)
downloadqmk_firmware-e987ce16525137efb50ce02a6552384851b49f88.tar.gz
qmk_firmware-e987ce16525137efb50ce02a6552384851b49f88.zip
Standardise error output. (#16220)
Diffstat (limited to 'builddefs')
-rw-r--r--builddefs/bootloader.mk2
-rw-r--r--builddefs/message.mk5
2 files changed, 6 insertions, 1 deletions
diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 56ef7ff5d8..226213297e 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -204,5 +204,5 @@ ifeq ($(strip $(BOOTLOADER)), md-boot)
endif
ifeq ($(strip $(BOOTLOADER_TYPE)),)
- $(error No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file)
+ $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file.)
endif
diff --git a/builddefs/message.mk b/builddefs/message.mk
index 1187491452..d441f560be 100644
--- a/builddefs/message.mk
+++ b/builddefs/message.mk
@@ -101,3 +101,8 @@ MSG_FLASH_ARCH = $(WARN_COLOR)WARNING:$(NO_COLOR) This board's architecture is n
MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying again in 5s (Ctrl+C to cancel)\n
BOOTLOADER_RETRY_TIME ?= 0.5
MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying again every $(BOOTLOADER_RETRY_TIME)s (Ctrl+C to cancel)
+
+define CATASTROPHIC_ERROR
+ $(shell printf "\n * %-99s $(ERROR_STRING)\n" "$2" >&2)
+ $(error $1)
+endef \ No newline at end of file