From nobody Thu Jul 27 04:12:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RBHQq4lWqz4pQJd; Thu, 27 Jul 2023 04:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RBHQq3qvTz3nSG; Thu, 27 Jul 2023 04:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pI9+gH8qcl7sftVehkLrjGP+Js7cGvCXCYp+/Ys9Azs=; b=j0O30sZy9qahynlKNDBJGgV3EgH7fUzi4CZ+NXFt/86jp95xm0KxWxbhSfMEHPap9udpQW oiPT8VaIPNgZtDOpqC/xvseEGbnHwkAUuxFthcK7taH1w3drH5sWr3aUFuy8evabVZ6c7w IXKuwKvWBDKyS951mDxFxZu/TvfQPoc/4NGNXghitNDMLwT/KELy0qZ0+IITFv3PtcZX8i HPyn12ZuPL4UIqj9S5dgXkgap0YUEVU/HqUrjWBPXfBQjsN++ARc4NDMNFfkJH09XpHN7l rgd9iUeDwo3JallwEIKCZ9x5WCxe56McDfy/Zv0AgNTS13TZE6b9V1Gz/sBxMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pI9+gH8qcl7sftVehkLrjGP+Js7cGvCXCYp+/Ys9Azs=; b=Cy0Yegq9+AhlU9ceyviUqEx3dY0dBtB4WOgjhE35ZlNwtZeq1vn6PFYCEdZGKeDFVlB7VL RwdsAY1wLgZHtgh/fOjElAcN0EZClh+P/Xah0d/M67zW+FnmIun4YMKtAA+C/+iNcgAL07 NKm9KHfZF4JVKtf8MK6g0vlPAp3UVRTRB9D3DyrMLI14TwRlYKlb+nN31GjhivaeZ9bL3b xAxh2qdwwnrcyaVFuyE7sHFbi1IK4UXtZixcoeZhFE3caKuhR3zrLO1/4J+fx/9o3xP3xX ZV29efyeyVIvLKycNkVgQnmEH3gyAGizA4JgduoUivv4sJU5vtzfO2tOcrAvhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690431123; a=rsa-sha256; cv=none; b=ToLZOUByhaxwsvJCYj9tCv6H/WAmYhPTUUuMTA9qCAjILm3v2UWqp/B+2QHrsdTJtd1rs+ LQjvNW45O/aPOL6XDTblpC3Qj5tQgIV2n582lmEhiPGdR5XJveKZXS+w5utOWRXPOOO/l9 DXReIsIJHCD+cowQDDu9OTttP5dwWNbijZislRZrVJDczdBKYTWaX70t12vWUUNnfaYzpV T54JS48Z1zhxdeJRBq7cxGDBzCAktF+LscrzpTC+S7rsr3gCoRVfe+x0sB0l4p8GZmJhHz 3GaTw7YdQQ3Rluapb8CR2KhKrd6ZkFlxsUudJCli1x1l5Amyz0z8iYRFD+wHHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RBHQq2ZB0z191N; Thu, 27 Jul 2023 04:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36R4C35V097684; Thu, 27 Jul 2023 04:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R4C3n3097683; Thu, 27 Jul 2023 04:12:03 GMT (envelope-from git) Date: Thu, 27 Jul 2023 04:12:03 GMT Message-Id: <202307270412.36R4C3n3097683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 8fc3059b00c5 - main - Makefile.inc1: Split _cleanworldtmp out from _worldtmp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fc3059b00c570fc7475ce84e5f8f8e13195df44 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=8fc3059b00c570fc7475ce84e5f8f8e13195df44 commit 8fc3059b00c570fc7475ce84e5f8f8e13195df44 Author: Jessica Clarke AuthorDate: 2023-07-27 04:10:48 +0000 Commit: Jessica Clarke CommitDate: 2023-07-27 04:10:48 +0000 Makefile.inc1: Split _cleanworldtmp out from _worldtmp This mirrors _cleanobj vs _obj, and will be used by etcupdate to ensure its build tree has host tools available when BUILD_WITH_STRICT_TMPPATH is enabled by default (whether in the source tree, like CheriBSD, or in a system config file). Note that due to line length the .MAKE .PHONY dependency line is split into two, one for the filtered WMAKE_TGTS and one for the filtered .ALLTARGETS. Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D41190 --- Makefile | 2 +- Makefile.inc1 | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 22d088c8f2da..f3bc3d1f96aa 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ list-old-dirs list-old-files list-old-libs \ obj objlink showconfig tags toolchain \ makeman sysent \ - _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ + _cleanworldtmp _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _build-metadata _cross-tools _includes _libraries \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools native-xtools-install stageworld stagekernel \ diff --git a/Makefile.inc1 b/Makefile.inc1 index 964bdfc08699..aa65711fbc0b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1028,12 +1028,12 @@ _cleanobj_fast_depend_hack: .PHONY ALL_libcompats=${_ALL_libcompats:Q} \ sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP} -_worldtmp: .PHONY +_cleanworldtmp: .PHONY +.if ${MK_CLEAN} == "yes" @echo @echo "--------------------------------------------------------------" - @echo ">>> Rebuilding the temporary build tree" + @echo ">>> Cleaning up the temporary build tree" @echo "--------------------------------------------------------------" -.if ${MK_CLEAN} == "yes" rm -rf ${WORLDTMP} .else # Note: for delete-old we need to set $PATH to also include the host $PATH @@ -1059,6 +1059,11 @@ _worldtmp: .PHONY @rm -f ${WORLDTMP}/usr/bin/ld ${WORLDTMP}/usr/bin/ld.lld .endif # ${USING_SYSTEM_LINKER} == "yes" .endif # ${MK_CLEAN} == "yes" +_worldtmp: .PHONY + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Rebuilding the temporary build tree" + @echo "--------------------------------------------------------------" @mkdir -p ${WORLDTMP} @touch ${WORLDTMP}/${.TARGET} # We can't use mtree to create the worldtmp directories since it may not be @@ -1174,7 +1179,7 @@ everything: .PHONY WMAKE_TGTS= .if !defined(WORLDFAST) -WMAKE_TGTS+= _sanity_check _worldtmp _legacy +WMAKE_TGTS+= _sanity_check _cleanworldtmp _worldtmp _legacy .if empty(SUBDIR_OVERRIDE) WMAKE_TGTS+= _bootstrap-tools .endif @@ -1690,7 +1695,8 @@ _cleankernobj_fast_depend_hack: .PHONY .endfor .endif -${WMAKE_TGTS:N_worldtmp:${libcompats:@v@Nbuild${v}@:ts:}} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY +${WMAKE_TGTS:N_cleanworldtmp:N_worldtmp:${libcompats:@v@Nbuild${v}@:ts:}}: .MAKE .PHONY +${.ALLTARGETS:M_*:N_cleanworldtmp:N_worldtmp}: .MAKE .PHONY # record kernel(s) build time in seconds .if make(buildkernel)