From 5f72ceb2c50d4fa316d26c51849baa200a38c1d8 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 16 Aug 2023 19:34:24 -0400
Subject: [PATCH] Cirrus-CI: for *-gcc12, build world with make -s

Cirrus-CI appears to have a 100MB limit for log output.  Use `make -s`
to attempt to reduce the amount of output.

Sponsored by:	The FreeBSD Foundation
---
 .cirrus.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5b033160b23..40ee2242588 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -52,6 +52,7 @@ task:
       TARGET_ARCH: amd64
       TOOLCHAIN: amd64-gcc12
       TOOLCHAIN_PKG: ${TOOLCHAIN}
+      EXTRA_MAKE_FLAGS: -s
   - name: aarch64-gcc12 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
@@ -60,6 +61,7 @@ task:
       TARGET_ARCH: aarch64
       TOOLCHAIN: aarch64-gcc12
       TOOLCHAIN_PKG: ${TOOLCHAIN}
+      EXTRA_MAKE_FLAGS: -s
   - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo)
     only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src'
     trigger_type: manual
@@ -68,6 +70,7 @@ task:
       TARGET_ARCH: amd64
       TOOLCHAIN: amd64-gcc12
       TOOLCHAIN_PKG: ${TOOLCHAIN}
+      EXTRA_MAKE_FLAGS: -s
   timeout_in: 120m
   install_script:
   - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG} git-lite
@@ -82,7 +85,7 @@ task:
   - chown user:user /usr/obj/$(pwd -P)
 
   build_world_script:
-  - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld"
+  - su user -c "make -j$(sysctl -n hw.ncpu) ${EXTRA_MAKE_FLAGS} CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld"
 
   build_kernel_script:
   - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildkernel"