From nobody Fri Jan 27 17:41:59 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 4P3Pyw1DG5z3bKsN; Fri, 27 Jan 2023 17:42:00 +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 4P3Pyw0fZvz3v9k; Fri, 27 Jan 2023 17:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674841320; 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=ybDlZMl8MQNxUMWv+HhHfdgALCS+gnfN4gV1mYokrxY=; b=hHp42leloGndnzjskhwwW08Kr0iwTaT3O1PlhlfAXdklfHOWVw5lbAvD6Oql2sryuRcMoS ol+hkWvB8EY3VubF+dLEcfNKUK5B03kTheXR+yeWV3/6esbDuAVqgkRXikRT1hl+CtUXW7 gYbdhVLrZVCZl/wZtrmC/yFVh173v4dybnFr941eUf9I3Wl6xGQhfMHeEaMS+XF6C7kj2K h9c1grFEiqch+uyjklavu/n6F+1E2CWrx2VL0/RSg/HSF78zcHENh1ZaZATag4E5lJyDHQ xguiwj1l7sawhfIIMKCD6IGRicJPFzZDjJ0GZ2TswzSphL7iKl+0gowh+TeFiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674841320; 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=ybDlZMl8MQNxUMWv+HhHfdgALCS+gnfN4gV1mYokrxY=; b=ERgKVItutk6YQrs5khhMiWc2yhn9MU5LN7NAF/RG4ykNdIGMjsvd9Sws1QLuRm3spOu1jC 2k++Sx5NCXvCEYL6hOh9eQ/qF0xjqL+Qj1cTIXEutinwTh4xzyT3fr3Xfjju+oH5CWt+GG 6JDoZmdiBeUKjUvyYAaf38OQ7kIxNHrMm7gO5lutqF+aFD0OPG7qurOWd05Sazg7vFbBVS GQcSsg4SZUSMuWDE9OtsnsFZCLJ99LKK8yJE/pZo0QWdgtUaXaf2wsnqkP6kAJfrt78U/F cQx8Ss7nt3iT6b8ThWlxzXyKsdiFSYdzxSOeHgjfFKD8xvir+pOq0Nw5n4pMLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674841320; a=rsa-sha256; cv=none; b=fCs0GGqhIx9vYtjqQuzZyLIfUvyl3r0RXa9TtXFA+IiBYwDewl7Nuo4Eqq/mGfk77MvmGb wAUgHcKiUm4CHx3IZjGtBoHnFMxLbQLSj9nO0lmLJRHlUixhDpgyLvlopLLHPLIgHYbmxv PqPq5BbNmIvMeffQ2DTMH2v2EKfJ+GkPj0c7INRLwLmQQZK+h8NySucMuZVR/LGGbTnfPV mIHsnThkNJijNd/9Nu5oazM6MaTlPDzF5ddnlWSp+BZn8i1iFg+mWWhj1lG7hte7yzuenZ JyGlZKI6G6Ntnw3RnUzwUc5sJ4XHwAblAoys9CDiHNqKY4pKTXP/tYIC7elFYw== 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 4P3Pyv6pytzHxb; Fri, 27 Jan 2023 17:41:59 +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 30RHfxim085338; Fri, 27 Jan 2023 17:41:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30RHfxH3085337; Fri, 27 Jan 2023 17:41:59 GMT (envelope-from git) Date: Fri, 27 Jan 2023 17:41:59 GMT Message-Id: <202301271741.30RHfxH3085337@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: 9501683925b2 - main - Revert "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: 9501683925b217b38d332f4dc13f9fe8f9ea0c29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9501683925b217b38d332f4dc13f9fe8f9ea0c29 commit 9501683925b217b38d332f4dc13f9fe8f9ea0c29 Author: John Baldwin AuthorDate: 2023-01-27 17:41:47 +0000 Commit: John Baldwin CommitDate: 2023-01-27 17:41:47 +0000 Revert "Don't omit bsd.compiler.mk for the nested delete-old in buildworld." The original motivation (src.opts.mk needing bsd.comppiler.mk to determine if CXX is supported) is no longer relevant now that CXX is non-optional. This reverts commit b9cb80883bce6dc992cf05ae2e59089a60d311ec. --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index dac412559716..ae50cdda508f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1024,7 +1024,7 @@ _worldtmp: .PHONY ${_+_}@if [ -e "${WORLDTMP}" ]; then \ echo ">>> Deleting stale files in build tree..."; \ cd ${.CURDIR}; env PATH=${TMPPATH:Q}:${PATH:Q} ${WMAKE:NPATH=*} \ - -DBATCH_DELETE_OLD_FILES delete-old \ + _NO_INCLUDE_COMPILERMK=t -DBATCH_DELETE_OLD_FILES delete-old \ delete-old-libs >/dev/null; \ fi rm -rf ${WORLDTMP}/legacy/usr/include