From nobody Wed Feb 09 17:40:39 2022 X-Original-To: dev-commits-src-branches@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 294DF19BF671; Wed, 9 Feb 2022 17:40:42 +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 4Jv6br2521z3kSF; Wed, 9 Feb 2022 17:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644428441; 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=TARiLr8wewXxdrjyoWChHZRW9Mhs+/jg2d3HTPz8ic4=; b=BC60ZLp3Mu5iWEnCrZVT0oIGT9x/L31b9XbRjADwtlbf3jJ0sw4OlVpBSjJe2Z0lSTDhJA uhTc+54JdlYfrflv0CmKY/LJKBYogF2MiluVIGZIwLFZSI4RM7GSCj4ocC6UJiFMqfDZlS BXhnxFOCRI9PpwpGRYTZA87CThTncCst5b0nF4DEeSm3ccHmYB5rGM2BnIHtXv0GiH4wX4 Q7E3ap4vOt1Qvpk8J4OfqMIA8aCOJX41kyY0DHB8n1tr2TOMTE8QwsnwkNZneDwGfWFFWE SXuFk3VF2oWmGmGb6O/8PlkyMyzhmzFHMkR4nrVSejKSbVIasL4Z1oV3ailyyg== 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 75E601163A; Wed, 9 Feb 2022 17:40:39 +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 219Hed36041322; Wed, 9 Feb 2022 17:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219Hed9d041321; Wed, 9 Feb 2022 17:40:39 GMT (envelope-from git) Date: Wed, 9 Feb 2022 17:40:39 GMT Message-Id: <202202091740.219Hed9d041321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 77a3ace8fec6 - stable/13 - OptionalObsoleteFiles: move /usr/bin/CC to MK_TOOLCHAIN section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 77a3ace8fec6b9624129b28b012b1e60bbc950d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644428441; 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=TARiLr8wewXxdrjyoWChHZRW9Mhs+/jg2d3HTPz8ic4=; b=mRRhLAKQ6sgF1XeUrPcstAQ3DTkSZKL73F7wi827KzRzHHjH4i3hh72gqPTSAnJsJWJDYB 4jnhjX4n1ei5zC/JX88nt4R/OI4anTXathsp576y+WyjLzT+G+fYTBVzILwQYAp877kmNT PFRs1rcC6s8QkZD9yhcZrN/D3LfNQChzD1pAcjQITn8l6D+9nX2r1PG70r0+8YccAsG/Cv BI1SC7E+faFgv93aZF/Ua4TdFfx0oleBvWHhYaKEKLdiVBKotxKSLb4/arvVAAGKdxIbKL akglJHnRL8ps+SyFddh7NPZIBBKRB39sMebpblWe5AFX2kqpSeDIwlqlBwfJuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644428441; a=rsa-sha256; cv=none; b=M0h0bkas48L0ywELntRhd7PP0YolTTZBmHcrIWR0U5ffLELN/7jjMT45LCXCK5/KCbvfqo c6gC+vZkYApjj+fMlh5BBN/Hlmmd6OMqWuiCYS+Q39h2sNFN0Aypkl65rLtKFEeWoJKrya VOGIS18tBl3AAYlwQtaP53vLYw7dT8lpCJlPG89943Z3DII6DoLXQBD0j2xbKFwkXvtbfk w/3TMgxJLZcMUNvMuOwk9s6tQWpFHQCzpBssLaxSWZzZVDiFRGBsamwf5gBVPITTX3IO6u +UXP7SMSIJNJmJ0opwQ8k1ELeHpoFlW2f2MwSu5CTZ22aLZm957GXho+9Y/4wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=77a3ace8fec6b9624129b28b012b1e60bbc950d8 commit 77a3ace8fec6b9624129b28b012b1e60bbc950d8 Author: Ed Maste AuthorDate: 2021-12-01 21:38:10 +0000 Commit: Ed Maste CommitDate: 2022-02-09 17:39:50 +0000 OptionalObsoleteFiles: move /usr/bin/CC to MK_TOOLCHAIN section /usr/bin/CC is installed by usr.bin/clang/clang/Makefile, as with /usr/bin/cc, /usr/bin/cpp, etc., and is not controlled by MK_CXX. Move it to the same section as those tools. (It may be that these should all be under MK_TOOLCHAIN == no || MK_CLANG_IS_CC == no, but that seems like unnecessary complexity.) Sponsored by: The FreeBSD Foundation (cherry picked from commit f7ea22e2115329b7a4f2c6620e59e644f509a4ca) --- tools/build/mk/OptionalObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e337ccae6fce..eea75dbca524 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1645,7 +1645,6 @@ OLD_DIRS+=usr/include/fs/cuse # devd(8) not listed here on purpose .if ${MK_CXX} == no -OLD_FILES+=usr/bin/CC OLD_FILES+=usr/bin/c++ .endif @@ -8899,6 +8898,7 @@ OLD_FILES+=usr/share/man/man8/tftpd.8.gz .endif .if ${MK_TOOLCHAIN} == no +OLD_FILES+=usr/bin/CC OLD_FILES+=usr/bin/addr2line OLD_FILES+=usr/bin/as OLD_FILES+=usr/bin/byacc