summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-05 22:27:48 +0000
committerQMK Bot <hello@qmk.fm>2021-01-05 22:27:48 +0000
commit621d54f6626a33b6a2e804d08da7f25353b6d2e0 (patch)
tree10e4f95c65f8090da0802c7c20f5718f75595d67
parent5846445f48b8c8eba547458a6853ec21ea69f94a (diff)
parent3edfb93d5de5ce1a783cecb2d97b0ca0ff1e0aff (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--tmk_core/rules.mk19
1 files changed, 18 insertions, 1 deletions
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index a77e55dd13..f5f758943e 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -150,6 +150,9 @@ ifeq ($(strip $(DEBUG_ENABLE)),yes)
else
ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),--listing-cont-lines=100
endif
+ifeq ($(VERBOSE_AS_CMD),yes)
+ ASFLAGS += -v
+endif
#---------------- Library Options ----------------
# Minimalistic printf version
@@ -192,6 +195,9 @@ CREATE_MAP ?= yes
ifeq ($(CREATE_MAP),yes)
LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
endif
+ifeq ($(VERBOSE_LD_CMD),yes)
+ LDFLAGS += -v
+endif
#LDFLAGS += -Wl,--relax
LDFLAGS += $(EXTMEMOPTS)
LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
@@ -327,8 +333,19 @@ $1_ASFLAGS = $$(ALL_ASFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS)
$1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN)
@mkdir -p $$(@D)
@$$(SILENT) || printf "$$(MSG_COMPILING) $$<" | $$(AWK_CMD)
- $$(eval CMD := $$(CC) -c $$($1_CFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+ $$(eval CC_EXEC := $$(CC))
+ ifneq ($$(VERBOSE_C_CMD),)
+ $$(if $$(filter $$(notdir $$(VERBOSE_C_CMD)),$$(notdir $$<)),$$(eval CC_EXEC += -v))
+ endif
+ ifneq ($$(VERBOSE_C_INCLUDE),)
+ $$(if $$(filter $$(notdir $$(VERBOSE_C_INCLUDE)),$$(notdir $$<)),$$(eval CC_EXEC += -H))
+ endif
+ $$(eval CMD := $$(CC_EXEC) -c $$($1_CFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
@$$(BUILD_CMD)
+ ifneq ($$(DUMP_C_MACROS),)
+ $$(eval CMD := $$(CC) -E -dM $$($1_CFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$<)
+ @$$(if $$(filter $$(notdir $$(DUMP_C_MACROS)),$$(notdir $$<)),$$(BUILD_CMD))
+ endif
# Compile: create object files from C++ source files.
$1/%.o : %.cpp $1/%.d $1/cxxflags.txt $1/compiler.txt | $(BEGIN)