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.
> +.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}
>
--
Regards,
Bryan Drewery
signature.asc
Description: OpenPGP digital signature
