Skip to content

Commit

Permalink
Avoid loading keymap rules.mk twice (#24665)
Browse files Browse the repository at this point in the history
  • Loading branch information
zvecr authored Dec 1, 2024
1 parent 1da8aa8 commit 5eb53be
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions builddefs/build_keyboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 5eb53be

Please sign in to comment.