Skip to content

Commit

Permalink
build: use bare (and portable) echo instead of echo -n
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bsdimp committed Dec 7, 2023
1 parent bd234c0 commit 7b085f1
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions Makefile.inc1
Original file line number Diff line number Diff line change
Expand Up @@ -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 "--------------------------------------------------------------"

#
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 7b085f1

Please sign in to comment.