summaryrefslogtreecommitdiffstats
path: root/builddefs
diff options
context:
space:
mode:
authorJoshua Diamond <josh@windowoffire.com>2022-08-13 17:13:15 -0400
committerGitHub <noreply@github.com>2022-08-14 07:13:15 +1000
commit2f87abd4ef8ef13d13ad10b80490bc74de7a5686 (patch)
tree1186024f50086ab7b0e07d4ea6a54a9d9fe78b22 /builddefs
parentb1c7df9a68919b071116c86f570d728d7c670870 (diff)
Revert "[Core] Re-order user space rules inclusion (#17459)" (#18032)
Diffstat (limited to 'builddefs')
-rw-r--r--builddefs/build_keyboard.mk18
1 files changed, 8 insertions, 10 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 5840378d9c..fe95dcaf15 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -118,15 +118,6 @@ MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_rules.mk)
include $(INFO_RULES_MK)
-# Userspace setup and definitions
-ifeq ("$(USER_NAME)","")
- USER_NAME := $(KEYMAP)
-endif
-USER_PATH := users/$(USER_NAME)
-
-# Pull in user level rules.mk
--include $(USER_PATH)/rules.mk
-
# Check for keymap.json first, so we can regenerate keymap.c
include $(BUILDDEFS_PATH)/build_json.mk
@@ -365,7 +356,14 @@ generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/def
.INTERMEDIATE : generated-files
-# Include user level config
+# Userspace setup and definitions
+ifeq ("$(USER_NAME)","")
+ USER_NAME := $(KEYMAP)
+endif
+USER_PATH := users/$(USER_NAME)
+
+# Pull in user level rules.mk
+-include $(USER_PATH)/rules.mk
ifneq ("$(wildcard $(USER_PATH)/config.h)","")
CONFIG_H += $(USER_PATH)/config.h
endif