Date: Fri, 11 Oct 2019 16:54:40 +0000 From: Brooks Davis <brooks@freebsd.org> To: Conrad Meyer <cem@freebsd.org> Cc: Brooks Davis <brooks@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r353408 - head Message-ID: <20191011165440.GA53377@spindle.one-eyed-alien.net> In-Reply-To: <CAG6CVpUdL297XdaW96mC7Jcgo=wk2JpZB9k=9-hFDQkEMR8T2A@mail.gmail.com> References: <201910101629.x9AGTDkJ024957@repo.freebsd.org> <CAG6CVpUdL297XdaW96mC7Jcgo=wk2JpZB9k=9-hFDQkEMR8T2A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable It worked for a default non-CROSS_TOOLCHAIN build, but I didn't test for repeatably or in other configurations. Enhancements welcome. -- Brooks On Thu, Oct 10, 2019 at 11:07:52PM -0700, Conrad Meyer wrote: > Fwiw, this doesn???t seem to fix the NO_CLEAN build for amd64-xtoolchain-= gcc. >=20 > On Thu, Oct 10, 2019 at 09:29 Brooks Davis <brooks@freebsd.org> wrote: >=20 > > 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= =2Ec > > 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 > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- 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} !=3D 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_atomi= c"; > > \ > > + 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" ] && \ > > --opJtzjQTFsWo+cga Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJdoLPPAAoJEKzQXbSebgfAzdYH/0dMYbC//UXyYo1ot8ZdkI19 LLZR8koIL+6NtzucaIdUsrcp6LUiXsgAHi2kMqTEtbT31CvRaDKJaxcHfqz7HrxD Bq4OIRVnEzkI9qYyCCHbW8Jl/O/37pDj4J9KN0XyxP9+5nUHga9W7YqEx6expTly z/ltFi4jKDAkYeCyT56+lVTIQtsaA9JuqZ4bUl3srmSQ6Gxj0JpyHsWJJcZ9uf0P 8fCRMxP9CkyfU5jV6fZx3/0psN37dGIKQKJDgusP48RmjE9ZdqPPKrk0I3xO2cuk MmQzq0tjY+Jz9Ou6VkPaxd2NjOgW+BPd3C+nbU7SnNsZ13Ke0zPXR9wRRheHmyw= =49vw -----END PGP SIGNATURE----- --opJtzjQTFsWo+cga--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191011165440.GA53377>