From dec04bd51e643ed956eb73d1a84caac71e7836cf Mon Sep 17 00:00:00 2001
From: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Date: Thu, 8 Apr 2021 15:49:46 +0100
Subject: [PATCH] Pass -s -de to buildworld/buildkernel make steps

Printing all the commands results in a 80+ MB logfile and is very rarely
useful. Passing -de should print the failed command but unfortunately
does not work when combined with -jN.
However, I have submitted a patch to fix this problem at
https://reviews.freebsd.org/D29647, so there should be no downsides to
enabling -s once that has been merged.
---
 scripts/build/build-world-kernel-head.sh | 4 ++--
 scripts/build/build-world-kernel.sh      | 4 ++--
 scripts/build/build1.sh                  | 4 ++--
 scripts/build/cross-build.sh             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/build/build-world-kernel-head.sh b/scripts/build/build-world-kernel-head.sh
index 0818447e..77e29d25 100644
--- a/scripts/build/build-world-kernel-head.sh
+++ b/scripts/build/build-world-kernel-head.sh
@@ -14,14 +14,14 @@ if [ -n "${CROSS_TOOLCHAIN}" ]; then
 	CROSS_TOOLCHAIN_PARAM=CROSS_TOOLCHAIN=${CROSS_TOOLCHAIN}
 fi
 
-sudo make -j ${JFLAG} -DNO_CLEAN \
+sudo make -s -de -j ${JFLAG} -DNO_CLEAN \
 	buildworld \
 	TARGET=${TARGET} \
 	TARGET_ARCH=${TARGET_ARCH} \
 	${CROSS_TOOLCHAIN_PARAM} \
 	__MAKE_CONF=${MAKECONF} \
 	SRCCONF=${SRCCONF}
-sudo make -j ${JFLAG} -DNO_CLEAN \
+sudo make -s -de -j ${JFLAG} -DNO_CLEAN \
 	buildkernel \
 	TARGET=${TARGET} \
 	TARGET_ARCH=${TARGET_ARCH} \
diff --git a/scripts/build/build-world-kernel.sh b/scripts/build/build-world-kernel.sh
index 655887b8..37248cd9 100644
--- a/scripts/build/build-world-kernel.sh
+++ b/scripts/build/build-world-kernel.sh
@@ -10,13 +10,13 @@ SRCCONF=${SRCCONF:-/dev/null}
 
 cd /usr/src
 
-sudo make -j ${JFLAG} -DNO_CLEAN \
+sudo make -s -de -j ${JFLAG} -DNO_CLEAN \
 	buildworld \
 	TARGET=${TARGET} \
 	TARGET_ARCH=${TARGET_ARCH} \
 	__MAKE_CONF=${MAKECONF} \
 	SRCCONF=${SRCCONF}
-sudo make -j ${JFLAG} -DNO_CLEAN \
+sudo make -s -de -j ${JFLAG} -DNO_CLEAN \
 	buildkernel \
 	TARGET=${TARGET} \
 	TARGET_ARCH=${TARGET_ARCH} \
diff --git a/scripts/build/build1.sh b/scripts/build/build1.sh
index 954a8583..ea41901a 100755
--- a/scripts/build/build1.sh
+++ b/scripts/build/build1.sh
@@ -55,6 +55,6 @@ set +x
 echo "--------------------------------------------------------------"
 set -x
 
-make -j 4 buildworld __MAKE_CONF=${WORKSPACE}/make.conf
-make -j 4 buildkernel __MAKE_CONF=${WORKSPACE}/make.conf
+make -s -de -j 4 buildworld __MAKE_CONF=${WORKSPACE}/make.conf
+make -s -de -j 4 buildkernel __MAKE_CONF=${WORKSPACE}/make.conf
 
diff --git a/scripts/build/cross-build.sh b/scripts/build/cross-build.sh
index f9c29fc1..67fcf635 100755
--- a/scripts/build/cross-build.sh
+++ b/scripts/build/cross-build.sh
@@ -72,6 +72,6 @@ echo "--------------------------------------------------------------"
 echo ""
 set -x
 
-make -j 4 CROSS_TOOLCHAIN=${TARGET_ARCH}-gcc buildworld __MAKE_CONF=${WORKSPACE}/make.conf
-make -j 4 CROSS_TOOLCHAIN=${TARGET_ARCH}-gcc buildkernel __MAKE_CONF=${WORKSPACE}/make.conf
+make -s -de -j 4 CROSS_TOOLCHAIN=${TARGET_ARCH}-gcc buildworld __MAKE_CONF=${WORKSPACE}/make.conf
+make -s -de -j 4 CROSS_TOOLCHAIN=${TARGET_ARCH}-gcc buildkernel __MAKE_CONF=${WORKSPACE}/make.conf