From nobody Sat Jan 11 03:50:24 2025 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 4YVPgN6zxKz5l8wV; Sat, 11 Jan 2025 03:50:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YVPgN6SXSz4S7Q; Sat, 11 Jan 2025 03:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736567424; 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=YeVNbOT4MEfTbVNmwVJfJajfvqBxU1ZsSuXCuhbpI2k=; b=tQsMNhVvUuMlSGDncMvtScysQZj2QFoyNFmVrUpm6uy5guPegQE79B02BgRvMUQx+69Ifa kDXyYQQJnOBAqQ6iRHF1ZVUIs8ajax2CNVBFcKU8XbtGsfyvCyTYIotySfGZnO0xt1yEDG 6OfH0/q+M644I7zGQt+SwUyUbBaEkJj6ofjQCSiag80NiF1YRqIWJje0Not73zqUu48GjV 1qQWHC4RiwQs6NyTOoxJmE8hgskI6vkUaPsEbPbB321d4NQb1AK2mZpX1l2v9ioo8Q6HTd FUKKpkiNR1Te1hGP5OwFHOmKpOAhD83AyUhfNdz+8uRhMSNQHkh2Fc+maC+7ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736567424; 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=YeVNbOT4MEfTbVNmwVJfJajfvqBxU1ZsSuXCuhbpI2k=; b=vUK8wjgzLWICCJCSkS/SVupMFDl06O0HALG0yae/8Jugf06lUDQ/zsdhSi6YbW8XOSPMQr R5JpWMBv54rVyNIjHu3atqmMxYrZ1Dzjx4eKIh35QhLfXtuwz3W8SluXylGG4LaxF8LegS GtmibqG8t2udugJmHVBmZI0BOBoaSumHuSe4JJuvKU1sJnHmMcGSmXOkXbHufqX5BJNWPd sS2sar5s/1yup2SPDgOQEz79cWOPFnRdylTKzytwwGu6YtV2OCWXyrBxLU9iq1napgAx0O eOsRVMkFShjpUmWsRwhAUm4nK+huR3ea1AJ066p9BDvdTluVMSAxA3Ar1bQd0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736567424; a=rsa-sha256; cv=none; b=snAIsCNNvmCiqA88vqLT9MWEvV10H/FvxhehmRSm3t6Mw0CWkOmo0nRQ13lEoe3Y1aWtlH 0GVtQ3E+NCrJ3ABMu/Gc2ZRRpltcrE3U89tdjRif0z/DwWZWmRpD3VrhVCz5siQZz7Az6l QzEQ2DDDI4tnYo2pWFkMw2/La5ofMaKYhP952uIH0qt7kMBH07bXoMWQ6LLLHjeaSUvIKF Xde98dXxfq+eWP8x/kxQ3ST6qyuzUD+xP7BmYPAOiY3M+UsOe1yB1Dgz83C5mdVa1JVeaA PYYSLpRmm+rJZa/pgp7tIgMmEBiyTMPYXUw0xZrJyNhanar89Dclj01gdMftcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YVPgN642Kzhvm; Sat, 11 Jan 2025 03:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50B3oON4089186; Sat, 11 Jan 2025 03:50:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50B3oOoO089183; Sat, 11 Jan 2025 03:50:24 GMT (envelope-from git) Date: Sat, 11 Jan 2025 03:50:24 GMT Message-Id: <202501110350.50B3oOoO089183@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: 550137eab24a - main - universe: Permit requesting a specific version of GCC 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 550137eab24ab6bdf05bfbb986927004b9f2f34e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=550137eab24ab6bdf05bfbb986927004b9f2f34e commit 550137eab24ab6bdf05bfbb986927004b9f2f34e Author: John Baldwin AuthorDate: 2025-01-11 03:49:59 +0000 Commit: John Baldwin CommitDate: 2025-01-11 03:49:59 +0000 universe: Permit requesting a specific version of GCC If USE_GCC_TOOLCHAINS is set to a value matching the pattern 'gcc*', use that as the GCC version. For example, USE_GCC_TOOLCHAINS=gcc16 would use amd64-gcc16 for amd64, etc. If the variable is set to a value that doesn't match that pattern, use the default version. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D48418 --- Makefile | 16 +++++++++------- share/man/man7/build.7 | 7 ++++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 5c113d5b83cc..1970cc736829 100644 --- a/Makefile +++ b/Makefile @@ -531,13 +531,15 @@ TARGET_ARCHES_${target}= ${MACHINE_ARCH_LIST_${target}} .endfor .if defined(USE_GCC_TOOLCHAINS) -TOOLCHAINS_amd64= amd64-gcc12 -TOOLCHAINS_arm= armv7-gcc12 -TOOLCHAINS_arm64= aarch64-gcc12 -TOOLCHAINS_i386= i386-gcc12 -TOOLCHAINS_powerpc= powerpc-gcc12 powerpc64-gcc12 -TOOLCHAIN_powerpc64= powerpc64-gcc12 -TOOLCHAINS_riscv= riscv64-gcc12 +_DEFAULT_GCC_VERSION= gcc12 +_GCC_VERSION= ${"${USE_GCC_TOOLCHAINS:Mgcc*}" != "":?${USE_GCC_TOOLCHAINS}:${_DEFAULT_GCC_VERSION}} +TOOLCHAINS_amd64= amd64-${_GCC_VERSION} +TOOLCHAINS_arm= armv7-${_GCC_VERSION} +TOOLCHAINS_arm64= aarch64-${_GCC_VERSION} +TOOLCHAINS_i386= i386-${_GCC_VERSION} +TOOLCHAINS_powerpc= powerpc-${_GCC_VERSION} powerpc64-${_GCC_VERSION} +TOOLCHAIN_powerpc64= powerpc64-${_GCC_VERSION} +TOOLCHAINS_riscv= riscv64-${_GCC_VERSION} .endif # If a target is using an external toolchain, set MAKE_PARAMS to enable use diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 32c33aa3d730..5ca44c51cf56 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 13, 2024 +.Dd January 10, 2025 .Dt BUILD 7 .Os .Sh NAME @@ -879,6 +879,11 @@ This variable implies Use external GCC toolchains to build the requested targets. If the required toolchain package for a supported architecture is not installed, the build for that architecture is skipped. +.Pp +A specific version of GCC can be used by setting the value of this variable +to the desired version +.Pq for example, Dq gcc14 ; +otherwise a default version of GCC is used. .It Va TARGETS Only build the listed targets instead of each supported architecture. .It Va EXTRA_TARGETS