diff options
| author | QMK Bot <hello@qmk.fm> | 2024-12-01 19:25:16 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2024-12-01 19:25:16 +0000 |
| commit | aa9e48dae274e85116117443f4b80a4503649992 (patch) | |
| tree | 06beb5ab340671e22fec1ff4586590814d0bd2b7 | |
| parent | df9bf9efa1bb0844f01c1c2fcc4ad7da78b30ac4 (diff) | |
| parent | 5eb53be671b4103626d0c0bb7828474d8be03ec7 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | builddefs/build_keyboard.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index afad67a76d..7d58c29462 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -197,8 +197,10 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "") KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h - # Load the keymap-level rules.mk if exists - -include $(KEYMAP_PATH)/rules.mk + ifeq ($(OTHER_KEYMAP_C),) + # Load the keymap-level rules.mk if exists (and we havent already loaded it for keymap.c) + -include $(KEYMAP_PATH)/rules.mk + endif # Load any rules.mk content from keymap.json INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON)) |