Skip to content

Commit b399a99

Browse files
bjacquinwlallemand
authored andcommitted
MINOR: build: discard echoing in help target
When V=1 is used in conjuction with help, the output becomes pretty difficult to read properly. $ make TARGET=linux-glibc V=1 help .. DEBUG_USE_ABORT: use abort() for program termination, see include/haproxy/bug.h for details echo; \ if [ -n "" ]; then \ if [ -n "" ]; then \ echo "Current TARGET: "; \ else \ echo "Current TARGET: (custom target)"; \ fi; \ else \ echo "TARGET not set, you may pass 'TARGET=xxx' to set one among :";\ echo " linux-glibc, linux-glibc-legacy, solaris, freebsd, dragonfly, netbsd,"; \ echo " osx, openbsd, aix51, aix52, aix72-gcc, cygwin, haiku, generic,"; \ echo " custom"; \ fi TARGET not set, you may pass 'TARGET=xxx' to set one among : linux-glibc, linux-glibc-legacy, solaris, freebsd, dragonfly, netbsd, osx, openbsd, aix51, aix52, aix72-gcc, cygwin, haiku, generic, custom echo;echo "Enabled features for TARGET '' (disable with 'USE_xxx=') :" Enabled features for TARGET '' (disable with 'USE_xxx=') : set -- POLL ; echo " $*" | (fmt || cat) 2>/dev/null POLL echo;echo "Disabled features for TARGET '' (enable with 'USE_xxx=1') :" Disabled features for TARGET '' (enable with 'USE_xxx=1') : set -- EPOLL KQUEUE NETFILTER PCRE PCRE_JIT PCRE2 PCRE2_JIT PRIVATE_CACHE THREAD PTHREAD_PSHARED BACKTRACE STATIC_PCRE STATIC_PCRE2 TPROXY LINUX_TPROXY LINUX_SPLICE LIBCRYPT CRYPT_H GETADDRINFO OPENSSL LUA FUTEX ACCEPT4 CLOSEFROM ZLIB SLZ CPU_AFFINITY TFO NS DL RT DEVICEATLAS 51DEGREES WURFL SYSTEMD OBSOLETE_LINKER PRCTL THREAD_DUMP EVPORTS OT QUIC; echo " $*" | (fmt || cat) 2>/dev/null EPOLL KQUEUE NETFILTER PCRE PCRE_JIT PCRE2 PCRE2_JIT PRIVATE_CACHE This commit ensure the help target always discard line echoing regardless of V variable as done for reg-tests-help target.
1 parent 4b1a05f commit b399a99

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -882,8 +882,8 @@ INCLUDES = $(wildcard include/*/*.h)
882882
DEP = $(INCLUDES) .build_opts
883883
884884
help:
885-
$(Q)sed -ne "/^[^#]*$$/q;s/^# \{0,1\}\(.*\)/\1/;p" Makefile
886-
$(Q)echo; \
885+
@sed -ne "/^[^#]*$$/q;s/^# \{0,1\}\(.*\)/\1/;p" Makefile
886+
@echo; \
887887
if [ -n "$(TARGET)" ]; then \
888888
if [ -n "$(set_target_defaults)" ]; then \
889889
echo "Current TARGET: $(TARGET)"; \
@@ -896,10 +896,10 @@ help:
896896
echo " osx, openbsd, aix51, aix52, aix72-gcc, cygwin, haiku, generic,"; \
897897
echo " custom"; \
898898
fi
899-
$(Q)echo;echo "Enabled features for TARGET '$(TARGET)' (disable with 'USE_xxx=') :"
900-
$(Q)set -- $(foreach opt,$(patsubst USE_%,%,$(use_opts)),$(if $(USE_$(opt)),$(opt),)); echo " $$*" | (fmt || cat) 2>/dev/null
901-
$(Q)echo;echo "Disabled features for TARGET '$(TARGET)' (enable with 'USE_xxx=1') :"
902-
$(Q)set -- $(foreach opt,$(patsubst USE_%,%,$(use_opts)),$(if $(USE_$(opt)),,$(opt))); echo " $$*" | (fmt || cat) 2>/dev/null
899+
@echo;echo "Enabled features for TARGET '$(TARGET)' (disable with 'USE_xxx=') :"
900+
@set -- $(foreach opt,$(patsubst USE_%,%,$(use_opts)),$(if $(USE_$(opt)),$(opt),)); echo " $$*" | (fmt || cat) 2>/dev/null
901+
@echo;echo "Disabled features for TARGET '$(TARGET)' (enable with 'USE_xxx=1') :"
902+
@set -- $(foreach opt,$(patsubst USE_%,%,$(use_opts)),$(if $(USE_$(opt)),,$(opt))); echo " $$*" | (fmt || cat) 2>/dev/null
903903
904904
# Used only to force a rebuild if some build options change, but we don't do
905905
# it for certain targets which take no build options

0 commit comments

Comments
 (0)