Date: Mon, 24 Jul 2017 21:14:12 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: Bryan Drewery <bdrewery@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r321433 - head Message-ID: <2EB128F7-BBFB-4BCC-87FF-BE416D461994@FreeBSD.org> In-Reply-To: <2fba04e9-520b-d36d-b038-25fe694724fb@FreeBSD.org> References: <201707241852.v6OIqe3F041498@repo.freebsd.org> <2fba04e9-520b-d36d-b038-25fe694724fb@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > On 24 Jul 2017, at 21:04, Bryan Drewery <bdrewery@FreeBSD.org> wrote: > > 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 >> >> 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. >> >> Reported by: Mark Millard >> MFC after: 2 months >> X-MFC-With: r321369 >> >> Modified: >> head/Makefile.inc1 >> >> Modified: head/Makefile.inc1 >> ============================================================================== >> --- 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 there 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=${d}${.CURDIR}/lib/clang/libllvm/Options.inc instead. I never fully understand how assignments work in bmake, this always goes wrong for me in for loops. Feel free to correct it so that it works, I'm afraid to touch this. :) -Dimitry [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.1 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCWXZHBAAKCRCwXqMKLiCW oxnkAKDUzuDIOjipWs4s7XPDfBNH5/dSxQCfdX8Us1N7h4Rpyru7qLdLURNDcsc= =DKVx -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2EB128F7-BBFB-4BCC-87FF-BE416D461994>