From nobody Sat Nov 19 04:13:10 2022 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 4NDgHV6YcKz4hgQD; Sat, 19 Nov 2022 04:13:10 +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 4NDgHV5rBJz3qRQ; Sat, 19 Nov 2022 04:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668831190; 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=TCXSlI65r1ZBbjBQ61XNOrUNOKD8mH9aJFX5XUEsw88=; b=pk1a1DfVz9WzcYvUhz87Pw040oDCRRAow0X2gbq1bXdjqS87TPQH/f7eZ+8HZccpn9QPkf b8cMJ+oWC6iQx1uKQd/kprN3mIhpTiW5jeU8KN0JmFhpLDi6RgmloN235meuq/jy9njPrQ zZ9W5dOGaEmKdxwKRmdpdsWFU/Cx73CAzgblH9l8UVi2ddpt85f1fuZuoDJ1iV1cja9RWy 3ug1Oi9TksBPjQHt24Z/YPG3BCwxAS2i9djXG19T8nAKtgOH4cx9g150RViWgNXLxns80y tU537hBnfHV0Nfs30PtIJHWtyf2AbDcsmwCljmGxYCIjH42PdPqMH2BB+WF0hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668831190; 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=TCXSlI65r1ZBbjBQ61XNOrUNOKD8mH9aJFX5XUEsw88=; b=OXj30z1kaA27D8PDyXBQo7NpVvNxx32UjjuUrjncVB5490q0cgnv2g+JUl1ko47R1f4K8C oHo53T37QMwYBux+NkSS1CtTIg7Ze5QEC9cijyfvoX92fvszkYsmeMwPqTDEeGPAW/ohXW y3qba8n8PIBfemfYtuwHjjWMpb3CdJvwx/1qkFsrKUP03GTksUDDPIgMbYSSZm8TDLFYpa bn/uVB0gOwyng1JiH9u5zJvdbnlcIaj9/fZwfXTbvGe+Eb8gg6uoPjJCW1RHC10OCHROHH CYr80/JJKwzzfIM2xCKoUidKPlKtrVwWtgL35WAMcof0XJKPQ9tlMYm7PHjhIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668831190; a=rsa-sha256; cv=none; b=lf/nThjSi4MEGHybLN6RVjbw4ekgswqu39IOFP+SoE+TahIWRCPIXGermU1NGJWBY+D2O5 uncyXIFEM/25+jLpTQ3MVbYJyow1J6fSelPY65s23P/KEM5uYMsiK4pG4G0weJdtiJhOak 671kaULKzzdygtoLNpmVDbMdGfi24vO8tcIwyD5LcBsWIHUXdILX9yMzNnV+R6d8Bf4h62 LUtiRRyqsS7imHDH/vHA2jaKtUfkk4mUiuD90iGUxr9iSvXZrpNB578CvRBy0gNrVFb5+f jEXdGW8JW2Tx8o1UiYIswwZLWLEzglmBgOYHkjoJElFWAcyROG1Aww0lpxUxjw== 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 4NDgHV4tCzzWyk; Sat, 19 Nov 2022 04:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AJ4DA45070716; Sat, 19 Nov 2022 04:13:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AJ4DAHg070715; Sat, 19 Nov 2022 04:13:10 GMT (envelope-from git) Date: Sat, 19 Nov 2022 04:13:10 GMT Message-Id: <202211190413.2AJ4DAHg070715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b9cb80883bce - main - Don't omit bsd.compiler.mk for the nested delete-old in buildworld. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9cb80883bce6dc992cf05ae2e59089a60d311ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b9cb80883bce6dc992cf05ae2e59089a60d311ec commit b9cb80883bce6dc992cf05ae2e59089a60d311ec Author: John Baldwin AuthorDate: 2022-11-19 04:11:07 +0000 Commit: John Baldwin CommitDate: 2022-11-19 04:11:07 +0000 Don't omit bsd.compiler.mk for the nested delete-old in buildworld. src.opts.mk will need bsd.compiler.mk to determine if CXX is supported. Without this, src.opts.mk always marks CXX as broken and attempts to delete all dependencies of MK_CXX from WORLDTMP. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D36890 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index f509208d045f..c14d801254c4 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1025,7 +1025,7 @@ _worldtmp: .PHONY ${_+_}@if [ -e "${WORLDTMP}" ]; then \ echo ">>> Deleting stale files in build tree..."; \ cd ${.CURDIR}; env PATH=${TMPPATH}:${PATH} ${WMAKE:NPATH=*} \ - _NO_INCLUDE_COMPILERMK=t -DBATCH_DELETE_OLD_FILES delete-old \ + -DBATCH_DELETE_OLD_FILES delete-old \ delete-old-libs >/dev/null; \ fi rm -rf ${WORLDTMP}/legacy/usr/include