1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD: makefile: add a qinfo macro to pass info in quiet mode

Browse Source 
Some commands such as $(cmd_CC) etc already handle the quiet vs verbose
mode in the makefile, but sometimes we may want to pass other info. The
new "qinfo" macro can be called with a 9-char string argument (spaces
included) as a prefix for some commands, to emit that string when in
quiet mode. The caller must fill the spaces needed for alignment. E.g:

  $(call quinfo,  CC     )$(CC) ...
This commit is contained in:
Willy Tarreau 2025-01-08 10:29:39 +01:00
parent c87619fa25
commit bd06502b22
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/make/verbose.mk
View File

@ -7,13 +7,17 @@ endif
# Some common commands such as CC/LD/AR are redefined with a cmd_ equivalent
# and are either mapped to a silent rule just indicating what is being done,
# or to themselves depending on the verbosity level.
# or to themselves depending on the verbosity level. The qinfo macro is meant
# to be called using $(call qinfo,<string>) as a prefix, and will be either
# empty or that <string>; the caller must pass the alignment spaces (9 chars
# total).
ifeq ($V,1)
cmd_CC = $(CC)
cmd_CXX = $(CXX)
cmd_LD = $(LD)
cmd_AR = $(AR)
cmd_MAKE = +$(MAKE)
qinfo =
else
ifeq (3.81,$(firstword $(sort $(MAKE_VERSION) 3.81)))
# 3.81 or above
@ -22,6 +26,7 @@ cmd_CXX = $(info $ CXX $@) $(Q)$(CXX)
cmd_LD = $(info $ LD $@) $(Q)$(LD)
cmd_AR = $(info $ AR $@) $(Q)$(AR)
cmd_MAKE = $(info $ MAKE $@) $(Q)+$(MAKE)
qinfo = $(info $(1) $@) $(Q)
else
# 3.80 or older
cmd_CC = $(Q)echo " CC $@";$(CC)
@ -29,5 +34,6 @@ cmd_CXX = $(Q)echo " CXX $@";$(CXX)
cmd_LD = $(Q)echo " LD $@";$(LD)
cmd_AR = $(Q)echo " AR $@";$(AR)
cmd_MAKE = $(Q)echo " MAKE $@";$(MAKE)
qinfo = $(Q)echo "$(1) $@";
endif
endif