diff options
| author | Nick Brassel <nick@tzarc.org> | 2024-08-12 22:34:22 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-12 22:34:22 +1000 |
| commit | 380e0c9cad72ac29f858bef85c8b8eb35b6931f0 (patch) | |
| tree | e711c1d30cb02a931db0b2a91c075dd65a38cb9f /builddefs | |
| parent | 158aaef78c26ea1ade9a5fbc0ee7fbe5b84a6fe9 (diff) | |
Userspace: add support for adding environment variables during build (#22887)
Diffstat (limited to 'builddefs')
| -rw-r--r-- | builddefs/build_keyboard.mk | 16 | ||||
| -rw-r--r-- | builddefs/converters.mk | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index f0788e55c9..e6bb1bcb5b 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -34,10 +34,16 @@ ifeq ($(strip $(DUMP_CI_METADATA)),yes) endif # Force expansion -TARGET := $(TARGET) +override TARGET := $(TARGET) +$(info TARGET=$(TARGET)) ifneq ($(FORCE_LAYOUT),) - TARGET := $(TARGET)_$(FORCE_LAYOUT) + override TARGET := $(TARGET)_$(FORCE_LAYOUT) + $(info TARGET=$(TARGET)) +endif +ifneq ($(CONVERT_TO),) + override TARGET := $(TARGET)_$(CONVERT_TO) + $(info TARGET=$(TARGET)) endif # Object files and generated keymap directory @@ -58,9 +64,6 @@ ifdef SKIP_GIT VERSION_H_FLAGS += --skip-git endif -# Generate the board's version.h file. -$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h) - # Determine which subfolders exist. KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD) KEYBOARD_FOLDER_PATH_2 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_1))) @@ -218,6 +221,9 @@ endif include $(BUILDDEFS_PATH)/converters.mk +# Generate the board's version.h file. +$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h) + MCU_ORIG := $(MCU) include $(wildcard $(PLATFORM_PATH)/*/mcu_selection.mk) diff --git a/builddefs/converters.mk b/builddefs/converters.mk index 3e77a070f2..b1e5a1bed2 100644 --- a/builddefs/converters.mk +++ b/builddefs/converters.mk @@ -32,9 +32,6 @@ ifneq ($(CONVERT_TO),) PLATFORM_KEY = $(shell echo $(CONVERTER) | cut -d "/" -f2) - # force setting as value can be from environment - override TARGET := $(TARGET)_$(CONVERT_TO) - # Configure any defaults OPT_DEFS += -DCONVERT_TO_$(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]') OPT_DEFS += -DCONVERTER_TARGET=\"$(CONVERT_TO)\" |