From nobody Wed Dec 01 21:45:40 2021 X-Original-To: dev-commits-src-main@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 0D1D418B33C4; Wed, 1 Dec 2021 21:45:41 +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 4J4CLr5Rd0z3PTl; Wed, 1 Dec 2021 21:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9618311273; Wed, 1 Dec 2021 21:45:40 +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 1B1LjewT086907; Wed, 1 Dec 2021 21:45:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B1LjeXa086905; Wed, 1 Dec 2021 21:45:40 GMT (envelope-from git) Date: Wed, 1 Dec 2021 21:45:40 GMT Message-Id: <202112012145.1B1LjeXa086905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f7ea22e21153 - main - OptionalObsoleteFiles: move /usr/bin/CC to MK_TOOLCHAIN section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f7ea22e2115329b7a4f2c6620e59e644f509a4ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638395140; 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=PccELxn3BW+2OcWoXutNlFQE1KMghhiqksOvRcYgOZo=; b=GdnYWuJjPIAqNF+kGKeRClPvFyZ3NHGk9ehr5nPRCrjG6judvY6y8SR6mI+4LugHh5dTPJ eP+7hCLV3kNLaIOdeLoriOl2gv552UREAq9q03WAVi6kq6Qa5MSr7w0gqVjrDPfGEzTMzR fBLU5EZG/e3iiA2UWIuduo/W8IjPsXPrmxrP1DRhRi/GMrBee2zhnystSnkjNkzdBLskB4 vYzWTZGqHgd2HIhNtjVkSVFCSjNVkS9Wyec/SX9uMA+qPHsaTbikPbVSQPSYnD9d4W5f4j mahUmJ/18ATIC45IixteTxYxLiwTrmGbO7FS7E6LEySL7J7taxNCx0yBljO8ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638395140; a=rsa-sha256; cv=none; b=pjH3F7Dqc3zaRJ7CWXow2Kxl/GJn7o9OwLRJcUFaXCuYZsoQqYQE73icbe4pFFNOzxKG4A xN43t/YBOVIsc3whRZghZf+q5M66kxXMSNnpwfBY8xTniNQlNcXSG9hXltLQzyuimvgxa1 tIA04VF3z57ClU6JyOQMvfbnJBd3ouvv6ldw/TPH+l7LKEOAIY8oqwZn+g72hlhBdMYppt zC2fr8TUmcBlV1nOH3ei1+p/At04TbfHpnf540dOmf3TnmiUanw86su0emw/taOhXkADGW /RepM7mkgDDz4dqqcG/FwUod91qfeLD7G5P4vuS9q8vxMYungZu9tkZACISCFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f7ea22e2115329b7a4f2c6620e59e644f509a4ca commit f7ea22e2115329b7a4f2c6620e59e644f509a4ca Author: Ed Maste AuthorDate: 2021-12-01 21:38:10 +0000 Commit: Ed Maste CommitDate: 2021-12-01 21:43:44 +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 --- 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 155c4fc82db6..d7531e188985 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1642,7 +1642,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 @@ -8898,6 +8897,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