5eb53be671b4103626d0c0bb7828474d8be03ec7
- Author
- Joel Challis <git@zvecr.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Avoid loading keymap rules.mk twice (#24665)
Diff
1diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
2index afad67a76da70a97fc973de02d10c987d1efb735..7d58c29462ac5c23b96e9df0f818b6490deebd5f 100644
3--- a/builddefs/build_keyboard.mk
4+++ b/builddefs/build_keyboard.mk
5@@ -197,8 +197,10 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
6 KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
7 KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h
8
9- # Load the keymap-level rules.mk if exists
10- -include $(KEYMAP_PATH)/rules.mk
11+ ifeq ($(OTHER_KEYMAP_C),)
12+ # Load the keymap-level rules.mk if exists (and we havent already loaded it for keymap.c)
13+ -include $(KEYMAP_PATH)/rules.mk
14+ endif
15
16 # Load any rules.mk content from keymap.json
17 INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))