From edcc769f3fbcae664805a44cb855544c326e1dcc Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 24 Jul 2017 18:52:40 +0000
Subject: [PATCH] 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
---
 Makefile.inc1 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index bba32772cc97..773aea0796cf 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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}