summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-01-02 22:26:26 +0000
committerGitHub <noreply@github.com>2023-01-02 22:26:26 +0000
commit20ee10339911d23139ab4c04c56229ed96595d98 (patch)
tree180120b90185102ed4f861aeadc1b67661b95d58
parentb497d58d6d0ca5a0d1432272147fe06e0ebfb802 (diff)
Remove cmp checks from Makefile (#19480)
-rw-r--r--Makefile2
-rw-r--r--builddefs/message.mk3
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 65b33105c4..8f7ad39b83 100644
--- a/Makefile
+++ b/Makefile
@@ -395,8 +395,6 @@ endef
395# Catch everything and parse the command line ourselves. 395# Catch everything and parse the command line ourselves.
396.PHONY: % 396.PHONY: %
397%: 397%:
398 # Check if we have the CMP tool installed
399 cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
400 # Ensure that $(QMK_BIN) works. 398 # Ensure that $(QMK_BIN) works.
401 if ! $(QMK_BIN) hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi 399 if ! $(QMK_BIN) hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi
402ifdef NOT_REPO 400ifdef NOT_REPO
diff --git a/builddefs/message.mk b/builddefs/message.mk
index 34a5e7da91..bf39554dab 100644
--- a/builddefs/message.mk
+++ b/builddefs/message.mk
@@ -68,7 +68,6 @@ MSG_NOT_REPO = $(WARN_COLOR)WARNING:$(NO_COLOR) Target folder is not a git repo,
68Please consider following $(BOLD)https://docs.qmk.fm/\#/newbs_getting_started$(NO_COLOR).\n\n 68Please consider following $(BOLD)https://docs.qmk.fm/\#/newbs_getting_started$(NO_COLOR).\n\n
69MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR) Some git submodules are out of date or modified.\n\ 69MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR) Some git submodules are out of date or modified.\n\
70Please consider running $(BOLD)qmk git-submodule$(NO_COLOR).\n\n 70Please consider running $(BOLD)qmk git-submodule$(NO_COLOR).\n\n
71MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR)
72 71
73define GENERATE_MSG_MAKE_KB 72define GENERATE_MSG_MAKE_KB
74 MSG_MAKE_KB_ACTUAL := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR) 73 MSG_MAKE_KB_ACTUAL := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR)
@@ -108,4 +107,4 @@ MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying a
108define CATASTROPHIC_ERROR 107define CATASTROPHIC_ERROR
109 $(shell printf "\n * %-99s $(ERROR_STRING)\n" "$2" >&2) 108 $(shell printf "\n * %-99s $(ERROR_STRING)\n" "$2" >&2)
110 $(error $1) 109 $(error $1)
111endef \ No newline at end of file 110endef