From 89bd07e927051c2d806de8e735aa1de750fdecd5 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 2 Nov 2017 20:45:04 +0000
Subject: DIRDEPS_BUILD: Cleanup leftover WORLDTMP files.

This will force any existing objects to rebuild if their .meta
files reference files from WORLDTMP.  This is a problem after
the UNIFIED_OBJDIR effort caused buildworld and DIRDEPS_BUILD
to share an OBJDIR.  Without cleaning these files the
Makefile.depend files end up with odd tmp/legacy/... entries
since some bootstrap-tools linger from there and otherwise
don't rebuild.  Removing the files causes anything having
used WORLDTMP to rebuild.

Sponsored by:	Dell EMC Isilon
---
 Makefile.inc1 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index 3c5e0188a813..4e8a8fd6493b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -815,6 +815,7 @@ _worldtmp: .PHONY
 	@echo "--------------------------------------------------------------"
 .if !defined(NO_CLEAN)
 	rm -rf ${WORLDTMP}
+	@mkdir -p ${WORLDTMP}
 .else
 .if exists(${WORLDTMP})
 	@echo ">>> Deleting stale files in build tree..."
@@ -831,6 +832,7 @@ _worldtmp: .PHONY
 .endfor
 .endif	# ${USING_SYSTEM_COMPILER} == "yes"
 .endif	# !defined(NO_CLEAN)
+	@touch ${WORLDTMP}/${.TARGET}
 
 .for _dir in \
     lib lib/casper usr legacy/bin legacy/usr
-- 
cgit v1.2.3