From owner-svn-src-head@freebsd.org Sun Oct 29 01:20:54 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC9F3E53CFB; Sun, 29 Oct 2017 01:20:54 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8DCD93F5F; Sun, 29 Oct 2017 01:20:54 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1Kr9O067870; Sun, 29 Oct 2017 01:20:53 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1KrPM067869; Sun, 29 Oct 2017 01:20:53 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290120.v9T1KrPM067869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:20:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325071 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325071 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:20:55 -0000 Author: bdrewery Date: Sun Oct 29 01:20:53 2017 New Revision: 325071 URL: https://svnweb.freebsd.org/changeset/base/325071 Log: Move FAST_DEPEND cleanup hack into its own target and call from _cleanobj. The _worldtmp target is for setting up WORLDTMP. Nothing between _worldtmp and _cleanobj will read these files. Move to its own target since it is so large. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:20:50 2017 (r325070) +++ head/Makefile.inc1 Sun Oct 29 01:20:53 2017 (r325071) @@ -768,41 +768,10 @@ _sanity_check: .PHONY .MAKE @false .endif -_worldtmp: .PHONY - @echo - @echo "--------------------------------------------------------------" - @echo ">>> Rebuilding the temporary build tree" - @echo "--------------------------------------------------------------" -.if !defined(NO_CLEAN) - rm -rf ${WORLDTMP} -.if defined(LIBCOMPAT) - rm -rf ${LIBCOMPATTMP} -.endif -.else -.if exists(${WORLDTMP}) - @echo ">>> Deleting stale files in build tree..." - ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ - delete-old delete-old-libs >/dev/null -.endif -.if defined(LIBCOMPAT) && exists(${LIBCOMPATTMP}) - ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ - DESTDIR=${LIBCOMPATTMP} \ - delete-old delete-old-libs >/dev/null -.endif - rm -rf ${WORLDTMP}/legacy/usr/include -.if ${USING_SYSTEM_COMPILER} == "yes" -.for cc in cc c++ - if [ -x ${WORLDTMP}/usr/bin/${cc} ]; then \ - inum=$$(stat -f %i ${WORLDTMP}/usr/bin/${cc}); \ - find ${WORLDTMP}/usr/bin -inum $${inum} -delete; \ - fi -.endfor -.endif # ${USING_SYSTEM_COMPILER} == "yes" - # Our current approach to dependency tracking cannot cope with certain source # tree changes, particularly with respect to removing source files and # replacing generated files. Handle these cases here in an ad-hoc fashion. -# +_cleanobj_fast_depend_hack: .PHONY # Syscall stubs rewritten in C # Date SVN Rev Syscalls # 20160829 r305012 ptrace @@ -841,6 +810,36 @@ _worldtmp: .PHONY .endif .endfor +_worldtmp: .PHONY + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Rebuilding the temporary build tree" + @echo "--------------------------------------------------------------" +.if !defined(NO_CLEAN) + rm -rf ${WORLDTMP} +.if defined(LIBCOMPAT) + rm -rf ${LIBCOMPATTMP} +.endif +.else +.if exists(${WORLDTMP}) + @echo ">>> Deleting stale files in build tree..." + ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ + delete-old delete-old-libs >/dev/null +.endif +.if defined(LIBCOMPAT) && exists(${LIBCOMPATTMP}) + ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ + DESTDIR=${LIBCOMPATTMP} \ + delete-old delete-old-libs >/dev/null +.endif + rm -rf ${WORLDTMP}/legacy/usr/include +.if ${USING_SYSTEM_COMPILER} == "yes" +.for cc in cc c++ + if [ -x ${WORLDTMP}/usr/bin/${cc} ]; then \ + inum=$$(stat -f %i ${WORLDTMP}/usr/bin/${cc}); \ + find ${WORLDTMP}/usr/bin -inum $${inum} -delete; \ + fi +.endfor +.endif # ${USING_SYSTEM_COMPILER} == "yes" .endif # !defined(NO_CLEAN) .for _dir in \ @@ -898,7 +897,9 @@ _cleanobj: .if defined(LIBCOMPAT) ${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} -f Makefile.inc1 ${CLEANDIR} .endif -.endif +.else + ${_+_}cd ${.CURDIR}; ${WMAKE} _cleanobj_fast_depend_hack +.endif # !defined(NO_CLEAN) _obj: @echo @echo "--------------------------------------------------------------"