You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/20 13:07:46 UTC
[incubator-nuttx] 06/09: tools/Makefile.host: Initialize Q by
inspecting V
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 816f624819f5b6e2b2c77324a1d3a8bc70ec426a
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 19 19:52:24 2020 +0800
tools/Makefile.host: Initialize Q by inspecting V
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/Makefile.host | 13 +++++++++++++
tools/mkconfigvars.sh | 2 +-
tools/refresh.sh | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile.host b/tools/Makefile.host
index f67e182..65ac92e 100644
--- a/tools/Makefile.host
+++ b/tools/Makefile.host
@@ -38,6 +38,19 @@ TOPDIR ?= $(CURDIR)/..
-include $(TOPDIR)/Make.defs
include ${TOPDIR}/tools/Config.mk
+# Control build verbosity
+#
+# V=1,2: Enable echo of commands
+# V=2: Enable bug/verbose options in tools and scripts
+
+ifeq ($(V),1)
+export Q :=
+else ifeq ($(V),2)
+export Q :=
+else
+export Q := @
+endif
+
# Check the endian-ness of the target
# Define HOSTCC on the make command line if it differs from these defaults
diff --git a/tools/mkconfigvars.sh b/tools/mkconfigvars.sh
index c22176a..b972198 100755
--- a/tools/mkconfigvars.sh
+++ b/tools/mkconfigvars.sh
@@ -115,7 +115,7 @@ else
if [ -x ${KCONFIG2HTML2} ]; then
KCONFIG2HTML=${KCONFIG2HTML2}
else
- make -C ${KCONFIG2MAKEDIR} -f ${KCONFIG2MAKEFILE} ${KCONFIG2HTML_TARGET} || \
+ make -C ${KCONFIG2MAKEDIR} -f ${KCONFIG2MAKEFILE} ${KCONFIG2HTML_TARGET} 1>/dev/null || \
{ echo "ERROR: make ${KCONFIG2HTML1} failed" ; exit 1 ; }
fi
fi
diff --git a/tools/refresh.sh b/tools/refresh.sh
index 0e7e4ea..cbeecfc 100755
--- a/tools/refresh.sh
+++ b/tools/refresh.sh
@@ -125,7 +125,7 @@ else
if [ -x ${CMPCONFIG2} ]; then
CMPCONFIG=${CMPCONFIG2}
else
- make -C ${CMPCONFIGMAKEDIR} -f ${CMPCONFIGMAKEFILE} ${CMPCONFIG_TARGET} || \
+ make -C ${CMPCONFIGMAKEDIR} -f ${CMPCONFIGMAKEFILE} ${CMPCONFIG_TARGET} 1>/dev/null || \
{ echo "ERROR: make ${CMPCONFIG1} failed" ; exit 1 ; }
fi
fi