qmk_firmware

commit: 5eb53be671b4103626d0c0bb7828474d8be03ec7
parent 1da8aa8259fe624e30f0f2c09a814798caebb9f6
Author: Joel Challis <git@zvecr.com>
Date:   Sun,  1 Dec 2024 19:24:44 +0000

Avoid loading keymap rules.mk twice (#24665)


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))