aboutsummaryrefslogtreecommitdiff
path: root/common_features.mk
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2020-07-26 13:57:37 -0700
committerGitHub <noreply@github.com>2020-07-26 21:57:37 +0100
commitd2be3a7339fe42629f3616a00708c5e74d84fe61 (patch)
tree14ec4098197963d6c2def6d412361875afbf9dfd /common_features.mk
parentaaf58155c7c9d8cf5235dd787530873a9c1f87cb (diff)
downloadqmk_firmware-d2be3a7339fe42629f3616a00708c5e74d84fe61.tar.gz
qmk_firmware-d2be3a7339fe42629f3616a00708c5e74d84fe61.zip
Fix Variable Trace handling (#9831)
It wants a number, but a number of files have it set to "no", even though it's commented out. This means that if you set it to no, it will cause a compiler error. This sets the default to "no", and checks to make sure it's not set to "no" before processing it, and striping the value from it.
Diffstat (limited to 'common_features.mk')
-rw-r--r--common_features.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/common_features.mk b/common_features.mk
index e23de553b..8443a759b 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -246,12 +246,13 @@ ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes)
246 VAPTH += $(SERIAL_PATH) 246 VAPTH += $(SERIAL_PATH)
247endif 247endif
248 248
249ifneq ($(strip $(VARIABLE_TRACE)),) 249VARIABLE_TRACE ?= no
250ifneq ($(strip $(VARIABLE_TRACE)),no)
250 SRC += $(QUANTUM_DIR)/variable_trace.c 251 SRC += $(QUANTUM_DIR)/variable_trace.c
251 OPT_DEFS += -DNUM_TRACED_VARIABLES=$(strip $(VARIABLE_TRACE)) 252 OPT_DEFS += -DNUM_TRACED_VARIABLES=$(strip $(VARIABLE_TRACE))
252ifneq ($(strip $(MAX_VARIABLE_TRACE_SIZE)),) 253 ifneq ($(strip $(MAX_VARIABLE_TRACE_SIZE)),)
253 OPT_DEFS += -DMAX_VARIABLE_TRACE_SIZE=$(strip $(MAX_VARIABLE_TRACE_SIZE)) 254 OPT_DEFS += -DMAX_VARIABLE_TRACE_SIZE=$(strip $(MAX_VARIABLE_TRACE_SIZE))
254endif 255 endif
255endif 256endif
256 257
257ifeq ($(strip $(LCD_ENABLE)), yes) 258ifeq ($(strip $(LCD_ENABLE)), yes)