Date: Mon, 24 Jul 2017 12:04:38 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Dimitry Andric <dim@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r321433 - head Message-ID: <2fba04e9-520b-d36d-b038-25fe694724fb@FreeBSD.org> In-Reply-To: <201707241852.v6OIqe3F041498@repo.freebsd.org> References: <201707241852.v6OIqe3F041498@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --K5Mcgt46Eb5BnIkprugWUaucDngeJI1Rb Content-Type: multipart/mixed; boundary="j4GKjoH4WxG1P8UmEVb1DaHSp0MuId5lG"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Dimitry Andric <dim@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <2fba04e9-520b-d36d-b038-25fe694724fb@FreeBSD.org> Subject: Re: svn commit: r321433 - head References: <201707241852.v6OIqe3F041498@repo.freebsd.org> In-Reply-To: <201707241852.v6OIqe3F041498@repo.freebsd.org> --j4GKjoH4WxG1P8UmEVb1DaHSp0MuId5lG Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 7/24/2017 11:52 AM, Dimitry Andric wrote: > Author: dim > Date: Mon Jul 24 18:52:40 2017 > New Revision: 321433 > URL: https://svnweb.freebsd.org/changeset/base/321433 >=20 > Log: > Cleanup stale Options.inc files from the previous libllvm build for > clang 4.0.0. Otherwise, these can get included before the two newly > generated ones (which are different) for clang 5.0.0. > =20 > Reported by: Mark Millard > MFC after: 2 months > X-MFC-With: r321369 >=20 > Modified: > head/Makefile.inc1 >=20 > 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 Mon Jul 24 18:25:08 2017 (r321432) > +++ head/Makefile.inc1 Mon Jul 24 18:52:40 2017 (r321433) > @@ -813,6 +813,16 @@ _worldtmp: .PHONY > ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.* > .endif > .endfor > +# 20170724 remove stale lib/clang/libllvm/Options.inc file, of which t= here are > +# two different versions after r308421, one for llvm-lib, one for llvm= -dlltool > +.for d in ${OBJTREE} ${WORLDTMP} > +.for f in ${d}${.CURDIR}/lib/clang/libllvm/Options.inc The 2nd .for is not needed, there's only 1 item. It could probably be f=3D${d}${.CURDIR}/lib/clang/libllvm/Options.inc instead. > +.if exists(${f}) || exists(${f}.d) > + @echo Removing stale generated ${f} files > + @rm -f ${f} ${f}.d > +.endif > +.endfor > +.endfor > .for _dir in \ > lib lib/casper usr legacy/bin legacy/usr > mkdir -p ${WORLDTMP}/${_dir} >=20 --=20 Regards, Bryan Drewery --j4GKjoH4WxG1P8UmEVb1DaHSp0MuId5lG-- --K5Mcgt46Eb5BnIkprugWUaucDngeJI1Rb Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZdkTGAAoJEDXXcbtuRpfP7hYH/01qC73rpHHZGy7hazlNiIQM 3gs3k1Bn12wbMkD7cdXhy6n1iKP4iMW5dHrRgxlJ1S3r83Jj1RJtDpzVhNLP97hi xzq0RnZd1dzEIKPUF8oCKknX/zZsZCMKufBmxsQYA5Vh+wrIRxp3tZNKq7O/Ukr3 vB5GFimsy8G1Gy8JItdx1SS9A6fLpKk5kF5rGsZlCVw/ABlukGkNJrKdS+9dV1pB mjwOTfDE7bXLX6YvULYPSCb9x6/WBoQxdxVuoRsWADYsav0wwX0YKFWXvVRtYy9R nSjTHmJc+43MTLihBsKyT9AJmgPcZjOcqw0Pod0bv+RzGiLoGOqQnFzVxy+FYdI= =Mp9Q -----END PGP SIGNATURE----- --K5Mcgt46Eb5BnIkprugWUaucDngeJI1Rb--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2fba04e9-520b-d36d-b038-25fe694724fb>