diff options
| author | Joel Challis <git@zvecr.com> | 2024-12-01 19:24:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-02 06:24:44 +1100 |
| commit | 5eb53be671b4103626d0c0bb7828474d8be03ec7 (patch) | |
| tree | a3a59765f9e97743dce9efa85282f7d52897d3b9 /builddefs | |
| parent | 1da8aa8259fe624e30f0f2c09a814798caebb9f6 (diff) | |
Avoid loading keymap rules.mk twice (#24665)
Diffstat (limited to 'builddefs')
| -rw-r--r-- | builddefs/build_keyboard.mk | 6 |
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))", "") | |||
| 197 | KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c | 197 | KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c |
| 198 | KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h | 198 | KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h |
| 199 | 199 | ||
| 200 | # Load the keymap-level rules.mk if exists | 200 | ifeq ($(OTHER_KEYMAP_C),) |
| 201 | -include $(KEYMAP_PATH)/rules.mk | 201 | # Load the keymap-level rules.mk if exists (and we havent already loaded it for keymap.c) |
| 202 | -include $(KEYMAP_PATH)/rules.mk | ||
| 203 | endif | ||
| 202 | 204 | ||
| 203 | # Load any rules.mk content from keymap.json | 205 | # Load any rules.mk content from keymap.json |
| 204 | INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON)) | 206 | INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON)) |