The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7b085f14b73c1ac7168b50a86478a32bbcaab1fa
commit 7b085f14b73c1ac7168b50a86478a32bbcaab1fa
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2023-12-07 20:27:27 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2023-12-07 20:42:52 +0000
build: use bare (and portable) echo instead of echo -n
There's no need to use echo -n here. A single echo will do nicely.
This fixes the post-buildworld output on a macos build, where echo -n
is implemented like System V instead of BSD (so you get two lines
first one starting with -n).
Sponsored by: Netflix
Reviewed by: jrtc27, emaste
Differential Revision: https://reviews.freebsd.org/D42869
---
Makefile.inc1 | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index d85e6fd8f15b..2a2df2becff2 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1231,8 +1231,7 @@ buildworld_epilogue: .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> World build completed on `LC_ALL=C date`"
@seconds=$$(($$(date '+%s') - ${_BUILDWORLD_START})); \
- echo -n ">>> World built in $$seconds seconds, "; \
- echo "ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
+ echo ">>> World built in $$seconds seconds, ncpu:
$$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
@echo "--------------------------------------------------------------"
#
@@ -1808,8 +1807,7 @@ buildkernel: .MAKE .PHONY
.endfor
@seconds=$$(($$(date '+%s') - ${_BUILDKERNEL_START})); \
- echo -n ">>> Kernel(s) ${BUILDKERNELS} built in $$seconds seconds, ";
\
- echo "ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
+ echo ">>> Kernel(s) ${BUILDKERNELS} built in $$seconds seconds, ncpu:
$$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
@echo "--------------------------------------------------------------"
.if !make(packages) && !make(update-packages)
