Fwiw, this doesn’t seem to fix the NO_CLEAN build for amd64-xtoolchain-gcc.
On Thu, Oct 10, 2019 at 09:29 Brooks Davis <bro...@freebsd.org> wrote: > Author: brooks > Date: Thu Oct 10 16:29:13 2019 > New Revision: 353408 > URL: https://svnweb.freebsd.org/changeset/base/353408 > > Log: > Fix -DNO_CLEAN build across r353340 and r353381 > > opensolaris_atomic.S is now only used on i386 with opensolaris_atomic.c > used on other platforms. After r353381 it doesn't exist on those > platforms so the stale dependency would result in a build error. > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > > ============================================================================== > --- head/Makefile.inc1 Thu Oct 10 16:04:43 2019 (r353407) > +++ head/Makefile.inc1 Thu Oct 10 16:29:13 2019 (r353408) > @@ -949,7 +949,18 @@ _sanity_check: .PHONY .MAKE > # replacing generated files. Handle these cases here in an ad-hoc > fashion. > _cleanobj_fast_depend_hack: .PHONY > # Syscall stubs rewritten in C and obsolete MD assembly implementations > -# Date SVN Rev Syscalls > +# Date SVN Rev Syscalls/Changes > +# 20191009 r353340 removal of opensolaris_atomic.S (also r353381) > +.if ${MACHINE} != i386 > +.for f in opensolaris_atomic > + @if [ -e "${OBJTOP}/cddl/lib/libzpool/.depend.${f}.o" ] && \ > + egrep -qw 'opensolaris_atomic\.S' > ${OBJTOP}/cddl/lib/libzpool/.depend.${f}.o; then \ > + echo "Removing stale dependencies for opensolaris_atomic"; > \ > + rm -f ${OBJTOP}/cddl/lib/libzpool/.depend.${f}.* \ > + > ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/cddl/lib/libzpool/.depend.${f}.*}; \ > + fi > +.endfor > +.endif > # 20190925 r352689 removal of obsolete i386 memchr.S > .for f in memchr > @if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \ > _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
