From c0db7a0beb55e25a55551e667ac8e12c75dc6189 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 26 Aug 2022 15:22:30 -0500 Subject: [PATCH] Fix ECHO, QUIET_FLAG and QUESTION_FLAG --- configure/CONFIG_COMMON | 16 +++++++++++----- configure/os/CONFIG.Common.RTEMS | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index bb6ff5933..19b26c24c 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -82,14 +82,20 @@ FINAL_LOCATION = $(INSTALL_ABSOLUTE) IOCS_APPL_TOP = $(INSTALL_ABSOLUTE) #------------------------------------------------------- -# Silencing the build - suppress messages during 'make -s' +# How to portably check the flags to make +define checkflags + make-$1 = $(findstring $1,$(filter-out --%,$(MAKEFLAGS))) +endef +# This is extensible to most single letter flags: +$(foreach flag,s q, $(eval $(call checkflags,$(flag)))) + +# Silent builds - suppress messages during 'make -s' NOP = : -ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo) -QUIET_FLAG := $(if $(filter -s,$(MFLAGS)),-q,) +ECHO = @$(if $(make-s),$(NOP),echo) +QUIET_FLAG := $(if $(make-s),-q,) -#------------------------------------------------------- # Convert 'make -q' flag into '-i' for genVersionHeader.pl -QUESTION_FLAG := $(if $(filter -q,$(MFLAGS)),-i,) +QUESTION_FLAG := $(if $(make-q),-i,) #------------------------------------------------------- ifdef T_A diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS index c8729f933..a736addaa 100644 --- a/configure/os/CONFIG.Common.RTEMS +++ b/configure/os/CONFIG.Common.RTEMS @@ -77,7 +77,7 @@ CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\ $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) -ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo) +ECHO = @$(if $(make-s),$(NOP),echo) # Originally set in os/CONFIG.UnixCommon.Common MKDIR = mkdir -p