locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Strip whitespace from CONVERT_TO variables (#19948)

Browse Source
This commit is contained in:
Joel Challis 2023-02-28 19:15:54 +00:00 committed by GitHub
parent 184c1e5187
commit fc05929124
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builddefs/converters.mk
View File

@ -7,7 +7,12 @@ endif
# TODO: opt in rather than assume everything uses a pro micro # TODO: opt in rather than assume everything uses a pro micro
PIN_COMPATIBLE ?= promicro PIN_COMPATIBLE ?= promicro
# Remove whitespace from any rule.mk provided vars
# - env cannot be overwritten but cannot have whitespace anyway
CONVERT_TO:=$(strip $(CONVERT_TO))
ifneq ($(CONVERT_TO),) ifneq ($(CONVERT_TO),)
# stash so we can overwrite env provided vars if needed # stash so we can overwrite env provided vars if needed
ACTIVE_CONVERTER=$(CONVERT_TO) ACTIVE_CONVERTER=$(CONVERT_TO)
@ -23,13 +28,13 @@ ifneq ($(CONVERT_TO),)
TARGET := $(TARGET)_$(CONVERT_TO) TARGET := $(TARGET)_$(CONVERT_TO)
# Configure any defaults # Configure any defaults
OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]')) OPT_DEFS += -DCONVERT_TO_$(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]')
OPT_DEFS += -DCONVERTER_TARGET=\"$(strip $(CONVERT_TO))\" OPT_DEFS += -DCONVERTER_TARGET=\"$(CONVERT_TO)\"
OPT_DEFS += -DCONVERTER_ENABLED OPT_DEFS += -DCONVERTER_ENABLED
VPATH += $(CONVERTER) VPATH += $(CONVERTER)
# Configure for "alias" - worst case it produces an idential define # Configure for "alias" - worst case it produces an idential define
OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]')) OPT_DEFS += -DCONVERT_TO_$(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]')
# Finally run any converter specific logic # Finally run any converter specific logic
include $(CONVERTER)/converter.mk include $(CONVERTER)/converter.mk