From nobody Mon Nov 21 19:56:50 2022 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 4NGJ7Q4rbLz4hNXN; Mon, 21 Nov 2022 19:56:50 +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 4NGJ7Q4MJ6z3tXS; Mon, 21 Nov 2022 19:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669060610; 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=uUNI+977b+Bh3+/7E5fG4zTqYyHDrbS4KDy6ZdPNxPU=; b=F0AufkgBRTEF0g/7JBFkgH22Is3YwhQRKDglD3YV0DOohsfrPqzMUP/lcYPOCVIaSzq4Tr u2DGkhRQJ8YTQXqnb5+6SbL5cFcoKxzIz6dhg1ZBmFwKtF0bN9IQgGQ9hwsGOy2DJOaIAg 4LQlWG1DFqTxi1DyNUOAKHy+IsY1YhBiHU3zMhsRtKDF/c8qFqZMOTCmio4QVDHKsA/FrO DIRcymItYqJyL8MO7OibXUfZeBqPJiVs/DyyqAw327zzW62pq2/U+zp346ABEJAyaSeQSC 5ABqOFNKicgFiaITgsIHX3yexB7d0kZNUGlLSpMxXOp5NfDS8Sa9JaML9HuOnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669060610; 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=uUNI+977b+Bh3+/7E5fG4zTqYyHDrbS4KDy6ZdPNxPU=; b=lZgrtgJsQoZk3Y0vIxnJUWfaLhWUl5tl/oEAVXLTSUFc7Pl131lLdCIkQRYqrUvdaS+jCA znQ0Hkr4ERk18diE2u6LNIXN25o6S9Kl0LyozYrchDK4S+RguS0Z8aFDh9JRmGPgmHxYi6 HQTZvE1j8ugDLFFGqA+kdYn05oQyED4XIAie5fn4YCiUrqsgD/CrNUYN7ZlIbNFjoNp21V We/DeklFsB5Xn9RrdfP5dTqzoxpuPa5EHROvLNOyJvtyYUtVdodLnQb6LdjaaZkrnxKcUc tYRKa5IORgJVJCCkaDG7tkm/vXTzg6TsDCH668z/NcjrzlHeUFKzasVcqhvIog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669060610; a=rsa-sha256; cv=none; b=WQTwTeliXRBeCu1N/jp7e5x4ZThY1vT/ZZfecim06JSBsQSNsUQt3cPGvZ+Fyrubr91fXL /WzQ2rC2qDBtBP8ELlIQHD7E4tLFYW4EPS6cczXcsRkrEKxXzYyfdL0GvFmFea4RgtDGfh xjt9SE6v+7ZAmlB49jxpA0tztecQXz59/eaJM/bGRiVsRuM8/2geWS8a7UDUAIq+Vts0MK zDntjNFcBsD5LAfkFzr4fJPLY0mOMV6xRPkMHVkM0yuSgyMwBikD690jvHVO6xJPi7EJG+ sgiYv7f8QHXX6hIDlqjrWuWHdmW3P/6ZaMqWfKP+5e7hK3MFqStf6VknlExWDA== 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 4NGJ7Q3F4HzFtq; Mon, 21 Nov 2022 19:56:50 +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 2ALJuoVB093743; Mon, 21 Nov 2022 19:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ALJuo3B093742; Mon, 21 Nov 2022 19:56:50 GMT (envelope-from git) Date: Mon, 21 Nov 2022 19:56:50 GMT Message-Id: <202211211956.2ALJuo3B093742@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: 20a66ab4bf85 - main - Retire CLANG_IS_CC option 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: 20a66ab4bf8511e51e11321b775d36c92e77fa69 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=20a66ab4bf8511e51e11321b775d36c92e77fa69 commit 20a66ab4bf8511e51e11321b775d36c92e77fa69 Author: Ed Maste AuthorDate: 2022-09-29 18:15:39 +0000 Commit: Ed Maste CommitDate: 2022-11-21 19:56:13 +0000 Retire CLANG_IS_CC option A small reduction in build infrastructure complexity; when we had both Clang and GCC in the tree it was useful to have both built, and choose one or the other to install as /usr/bin/cc. Now only Clang is in the tree, and there is no point in building and installing base Clang but not providing it as cc (and c++, cpp). Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37075 --- Makefile.inc1 | 1 - UPDATING | 4 ++++ share/man/man5/src.conf.5 | 8 +------- share/mk/src.opts.mk | 1 - tools/build/options/WITHOUT_CLANG_IS_CC | 6 ------ tools/build/options/WITH_CLANG_IS_CC | 6 ------ usr.bin/clang/clang/Makefile | 3 +-- 7 files changed, 6 insertions(+), 23 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c14d801254c4..112f335d7c11 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -759,7 +759,6 @@ TMAKE= \ # TOOLS_PREFIX set in BMAKE XMAKE= ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - MK_CLANG_IS_CC=${MK_CLANG_BOOTSTRAP} \ MK_LLDB=no \ MK_LLVM_BINUTILS=no \ MK_TESTS=no diff --git a/UPDATING b/UPDATING index 5e94336a82f2..3782692c2a49 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20221121: + The WITHOUT_CLANG_IS_CC option has been removed. When Clang is enabled + it is always installed as /usr/bin/cc (and c++, cpp). + 20221026: Some programs have been moved into separate packages. It is recommended for pkgbase users to do: diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index e6a1fc52a23e..132a05065bd0 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd November 18, 2022 +.Dd November 21, 2022 .Dt SRC.CONF 5 .Os .Sh NAME @@ -386,12 +386,6 @@ Build clang-format. .It Va WITHOUT_CLANG_FULL Avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of the Clang C/C++ compiler. -.It Va WITHOUT_CLANG_IS_CC -Do not install links to the Clang C/C++ compiler as -.Pa /usr/bin/cc , -.Pa /usr/bin/c++ -and -.Pa /usr/bin/cpp . .It Va WITHOUT_CLEAN Do not clean before building world and/or kernel. .It Va WITHOUT_CPP diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 5089a034350d..adb6912daa7d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -81,7 +81,6 @@ __DEFAULT_YES_OPTIONS = \ CDDL \ CLANG \ CLANG_BOOTSTRAP \ - CLANG_IS_CC \ CLEAN \ CPP \ CROSS_COMPILER \ diff --git a/tools/build/options/WITHOUT_CLANG_IS_CC b/tools/build/options/WITHOUT_CLANG_IS_CC deleted file mode 100644 index 85d80ad476a5..000000000000 --- a/tools/build/options/WITHOUT_CLANG_IS_CC +++ /dev/null @@ -1,6 +0,0 @@ -.\" $FreeBSD$ -Do not install links to the Clang C/C++ compiler as -.Pa /usr/bin/cc , -.Pa /usr/bin/c++ -and -.Pa /usr/bin/cpp . diff --git a/tools/build/options/WITH_CLANG_IS_CC b/tools/build/options/WITH_CLANG_IS_CC deleted file mode 100644 index 9ab78c569dd2..000000000000 --- a/tools/build/options/WITH_CLANG_IS_CC +++ /dev/null @@ -1,6 +0,0 @@ -.\" $FreeBSD$ -Install links to the Clang C/C++ compiler as -.Pa /usr/bin/cc , -.Pa /usr/bin/c++ -and -.Pa /usr/bin/cpp . diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 31f092608583..b3f1ff965634 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -19,7 +19,7 @@ LINKS= ${BINDIR}/clang ${BINDIR}/clang++ \ ${BINDIR}/clang ${BINDIR}/clang-cpp MLINKS= clang.1 clang++.1 \ clang.1 clang-cpp.1 -.if ${MK_CLANG_IS_CC} != "no" + SCRIPTS=CC.sh SCRIPTSNAME=CC @@ -30,7 +30,6 @@ MLINKS+= clang.1 cc.1 \ clang.1 c++.1 \ clang.1 CC.1 \ clang.1 cpp.1 -.endif LIBADD+= z