qmk_firmware

commit: aa9e48dae274e85116117443f4b80a4503649992
parent df9bf9efa1bb0844f01c1c2fcc4ad7da78b30ac4
Author: QMK Bot <hello@qmk.fm>
Date:   Sun,  1 Dec 2024 19:25:16 +0000

Merge remote-tracking branch 'origin/master' into develop

Diffstat:
M
builddefs/build_keyboard.mk
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git 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))