aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <[email protected]>2024-12-01 19:24:44 +0000
committerGitHub <[email protected]>2024-12-02 06:24:44 +1100
commit5eb53be671b4103626d0c0bb7828474d8be03ec7 (patch)
treea3a59765f9e97743dce9efa85282f7d52897d3b9
parent1da8aa8259fe624e30f0f2c09a814798caebb9f6 (diff)
downloadqmk_firmware-5eb53be671b4103626d0c0bb7828474d8be03ec7.tar.gz
qmk_firmware-5eb53be671b4103626d0c0bb7828474d8be03ec7.zip
Avoid loading keymap rules.mk twice (#24665)0.27.1
-rw-r--r--builddefs/build_keyboard.mk6
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))