In message <202404181358.43idwc0k076...@gitrepo.freebsd.org>, Brooks Davis writ es: > The branch main has been updated by brooks: > > URL: https://cgit.FreeBSD.org/src/commit/?id=26a09db3add30238b99e3214c56a3aee > 63fd71d1 > > commit 26a09db3add30238b99e3214c56a3aee63fd71d1 > Author: Brooks Davis <bro...@freebsd.org> > AuthorDate: 2024-04-18 13:57:38 +0000 > Commit: Brooks Davis <bro...@freebsd.org> > CommitDate: 2024-04-18 13:58:17 +0000 > > Fix incremental build with WITH_NVME newly enabled > > rescue.mk doesn't get updated when options change so nvme_util.o is now > missing on architectures were NVME was previously marked BROKEN. > > Reviewed by: imp > Fixes: 2fda3ab0ac19 WITH_NVME: Remove from broken. > Differential Revision: https://reviews.freebsd.org/D44826 > --- > tools/build/depend-cleanup.sh | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh > index 71988e526369..a7b4f99cbc5f 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -228,3 +228,10 @@ if [ ${MACHINE} != i386 -a -f "$OBJTOP"/lib/libsys/.depe > nd.syscall.o ] && \ > clean_dep lib/libsys syscall S > clean_dep lib/libc syscall S > fi > + > +# 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken > +if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ > + grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then > + echo "removing rescue.mk without nvme_util.o"; then ^^^^ Stray "then" breaks the build.
> + rm -f "$OBJTOP"/rescue/rescue/rescue.mk > +fi > -- Cheers, Cy Schubert <cy.schub...@cschubert.com> FreeBSD UNIX: <c...@freebsd.org> Web: https://FreeBSD.org NTP: <c...@nwtime.org> Web: https://nwtime.org e^(i*pi)+1=0
