Date: Mon, 24 Jul 2017 18:52:40 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r321433 - head Message-ID: <201707241852.v6OIqe3F041498@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 +.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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707241852.v6OIqe3F041498>