diff options
| author | Yurii Shutkin <shutkin@google.com> | 2024-02-13 16:38:38 +0100 |
|---|---|---|
| committer | Yurii Shutkin <shutkin@google.com> | 2024-02-13 16:43:15 +0100 |
| commit | 6440791888de53b6e0b75461c26c18770a316dab (patch) | |
| tree | fc2742ba7c43cc94fbc99dff52a0428bcbbc4b0e | |
| parent | 689e41994b0376097a79d0fc5499bc651cd3ac14 (diff) | |
| download | common-6440791888de53b6e0b75461c26c18770a316dab.tar.gz | |
build: add makefile macro ECHO_LOG, rename LOG -> INFO_LOG
Change-Id: Ic61c656b9f826d75862ede651ac94caa07a71d59
Bug: None
Test: build.py --color-log
| -rw-r--r-- | engine.mk | 6 | ||||
| -rw-r--r-- | make/build.mk | 2 | ||||
| -rw-r--r-- | make/macros.mk | 6 |
3 files changed, 8 insertions, 6 deletions
@@ -244,7 +244,7 @@ GLOBAL_CPPFLAGS := $(GLOBAL_SHARED_CPPFLAGS) $(GLOBAL_KERNEL_CPPFLAGS) GLOBAL_ASMFLAGS := $(GLOBAL_SHARED_ASMFLAGS) $(GLOBAL_KERNEL_ASMFLAGS) GLOBAL_LDFLAGS := $(GLOBAL_SHARED_LDFLAGS) $(GLOBAL_KERNEL_LDFLAGS) -$(call LOG,Project entry) +$(call INFO_LOG,Project entry) $(info PROJECT = $(PROJECT)) $(info PLATFORM = $(PLATFORM)) $(info TARGET = $(TARGET)) @@ -258,7 +258,7 @@ SCS_ENABLED = $(KERNEL_SCS_ENABLED) include arch/$(ARCH)/rules.mk include top/rules.mk -$(call LOG,Include recurse.mk) +$(call INFO_LOG,Include recurse.mk) # recursively include any modules in the MODULE variable, leaving a trail of included # modules in the ALLMODULES list include make/recurse.mk @@ -496,7 +496,7 @@ endif .PHONY: configheader # all build rules are defined, start build process -$(call LOG,Start building) +$(call INFO_LOG,Start building) endif diff --git a/make/build.mk b/make/build.mk index 54940aac..54c564fd 100644 --- a/make/build.mk +++ b/make/build.mk @@ -5,7 +5,7 @@ endif $(EXTRA_LINKER_SCRIPTS): $(OUTBIN): $(OUTELF) - @echo generating image: $@ + @$(call ECHO_LOG,Generating image: $@) $(NOECHO)$(SIZE) $< $(NOECHO)$(OBJCOPY) -O binary $< $@ diff --git a/make/macros.mk b/make/macros.mk index 224220b6..bd57b391 100644 --- a/make/macros.mk +++ b/make/macros.mk @@ -97,19 +97,21 @@ LOG_DONE=@done@ LOG_SDONE=@sdone@ LOG_PRINT=@print@ LOG_SEPARATOR=@:@ -LOG = $(info $(LOG_PREFIX)$(LOG_PRINT)$1) +INFO_LOG = $(info $(LOG_PREFIX)$(LOG_PRINT)$1) INFO = $(info $(LOG_PREFIX)$1$(LOG_SEPARATOR)$2$(LOG_SEPARATOR)$3) INFO_DONE = $(info $(LOG_PREFIX)$(LOG_DONE)$1$(LOG_SEPARATOR)$2$(LOG_SEPARATOR)$3) INFO_DONE_SILENT = $(info $(LOG_PREFIX)$(LOG_SDONE)$1$(LOG_SEPARATOR)$2$(LOG_SEPARATOR)$3) +ECHO_LOG = echo $(LOG_PREFIX)$(LOG_PRINT)$1 ECHO = echo $(LOG_PREFIX)$1$(LOG_SEPARATOR)$2$(LOG_SEPARATOR)$3 ECHO_DONE = echo $(LOG_PREFIX)$(LOG_DONE)$1$(LOG_SEPARATOR)$2$(LOG_SEPARATOR)$3 ECHO_DONE_SILENT = echo $(LOG_PREFIX)$(LOG_SDONE)$1$(LOG_SEPARATOR)$2$(LOG_SEPARATOR)$3 else # just output as regular -LOG = $(info $1) +INFO_LOG = $(info $1) INFO = $(info $2 $3 for $1) INFO_DONE = $(info $2 $3 for $1) INFO_DONE_SILENT = +ECHO_LOG = echo $1 ECHO = echo $2 $3 ECHO_DONE = echo $2 $3 ECHO_DONE_SILENT = |