From nobody Thu Mar 26 12:31:13 2026 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 4fhNRm1NS3z674dR; Thu, 26 Mar 2026 12:31:16 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhNRm0mFzz3PgC; Thu, 26 Mar 2026 12:31:16 +0000 (UTC) (envelope-from tijl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774528276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LRYWb74OKgDMz+/MZmKGd5lm4/iXhtBajWzBZfffeFU=; b=gbmZQkoQ1H/VEkEND8AYXOUagDIcNsgP234vFXZ2KxbIyN3rWX7fgmEDiClOOBIUJ++inI +AWY2CISLfoAJbWkJs8WIV1Tjl03DDgI+Gg60u4BCRo0x7WO8WAhl5IPLZ1QlJuiMl0npI wSl+/rdnFLXGh7u+tyUwgpAG5niE68hOyEXxvm1gSrVwvHNR9R8GXug/7iogDiIzqJTFnN pqNbK0gi7tF20f2MJ5qs3nJRyVtryIlWHQS3E2uQr6wDvp1kMcPi/cheDSZbrFhlLX/799 SQ18yEiokGIpdl9crK0tvwwCCqgxy+UU9GBPJYWsG9wLS7tnXL9ylSiIENLLWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774528276; a=rsa-sha256; cv=none; b=vtsYROK4RQ4fFKk2jWCNQXj7bgEuBsnz1K+Qc45V4XNZrsi/QlRXX2HwbIWJKco5oWYInY cwT8PWFwwZmpLRC8AINakcKtpxK9rnju/rUEM9y6084KAeLT+T2hZSQ0pyrI9dhh8Cla26 Bgz+nAdD03wOFquUHvKSNb/0ttP7SyeB+GHomkOSa63EnbcTS7Kiqa0rzu8eWSWvcufO4b D8eBwsc2+xoNw21i8bsEtnhT9UuKBOAXusjrNAAsqnQjYcR/mtLnc3thvDPwdObfLH7cM4 T5ktE01JDEGxXjuCMKR5KKawlInpoFdRy0JTNEkjeDsqJkkcRWryscXus3mQzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774528276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LRYWb74OKgDMz+/MZmKGd5lm4/iXhtBajWzBZfffeFU=; b=BQKWiIyd2Kv3mmUe2TW+TeDVhkacvPjRqfGkwkq/B1txWHXxzJ6hN8661RUfA81FW/QlyW Fx9G8A+jdli+qp5v7IfMj6DHdYSV0myMq8zjCbSmtLRaKp61NXrw7Eegig6sRfy88UrgQr tRb9Sn3VbhtKkpT/nTRBQbfo3oQw5BJb1mEsxnRU+qgxxPQ/VFWGYMbuZ/wY1phwPhEz/o nwOoNHG9WyWaExpMUjVd8Kz+KkQUhQwEkK0H3v1AE+ZLM71e877MNWeNsW/vhG93YFXNYW 2tidtwCl4ju51ltJCyjGv861+GTRg1aMbgoXfDRvMm3aUeRu1LB8x0SYEPlp1w== Received: from hal.tijl.coosemans.org (unknown [IPv6:2a02:a03f:8941:cb00:73e7:c8ed:b8b5:7bda]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: tijl) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fhNRl2zJDz6rL; Thu, 26 Mar 2026 12:31:15 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Date: Thu, 26 Mar 2026 13:31:13 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 17494c6e6b7d - main - build: Boostrap LLVM_BINUTILS for cross-tools Message-ID: <20260326133113.7dcf71e7@hal.tijl.coosemans.org> In-Reply-To: <69bd4e24.3bb70.7228f0e9@gitrepo.freebsd.org> References: <69bd4e24.3bb70.7228f0e9@gitrepo.freebsd.org> 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=US-ASCII Content-Transfer-Encoding: 7bit On Fri, 20 Mar 2026 13:39:48 +0000 Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=17494c6e6b7d5e2be34d2469566a59bbd9dceb8a > > commit 17494c6e6b7d5e2be34d2469566a59bbd9dceb8a > Author: Ed Maste > AuthorDate: 2026-03-18 15:09:53 +0000 > Commit: Ed Maste > CommitDate: 2026-03-20 13:38:40 +0000 > > build: Boostrap LLVM_BINUTILS for cross-tools > > Reported by: vexeduxr, jrtc27 > Reviewed by: imp > Sponsored by: The FreeBSD Foundation > Pull request: https://github.com/freebsd/freebsd-src/pull/2084 > Differential Revision: https://reviews.freebsd.org/D55923 > --- > Makefile.inc1 | 19 +++++++++++++++++-- > share/man/man5/src.conf.5 | 13 +++++++++++++ > share/mk/src.opts.mk | 1 + > tools/build/options/WITHOUT_LLVM_BINUTILS_BOOTSTRAP | 12 ++++++++++++ > 4 files changed, 43 insertions(+), 2 deletions(-) > > diff --git a/Makefile.inc1 b/Makefile.inc1 > index c4696abae8cd..16cd9b695109 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -239,6 +239,12 @@ X${BINUTIL}?= ${${BINUTIL}} > MK_LLD_BOOTSTRAP= no > .endif > > +# If full paths to all standard bintuils are given, don't build LLVM binutils. > +.if ${XAR:M/*} && ${XNM:M/*} && ${XOBJCOPY:M/*} && ${XRANLIB:M/*} && \ > + ${XSIZE:M/*} && ${XSTRINGS:M/*} && ${XSTRIPBIN:M/*} > +MK_LLVM_BINUTILS_BOOTSTRAP= no > +.endif > + > # We also want the X_LINKER* variables if we are using an external toolchain. > _WANT_TOOLCHAIN_CROSS_VARS= t > .include "share/mk/bsd.linker.mk" > @@ -2701,7 +2707,8 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptree > # llvm-tblgen is also needed for various llvm binutils (e.g. objcopy). > .if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" || \ > ${MK_LLD_BOOTSTRAP} != "no" || ${MK_LLD} != "no" || \ > - ${MK_LLDB} != "no" || ${MK_LLVM_BINUTILS} != "no" > + ${MK_LLDB} != "no" || \ > + ${MK_LLVM_BINUTILS_BOOTSTRAP} != "no" || ${MK_LLVM_BINUTILS} != "no" > _clang_tblgen= \ > lib/clang/libllvmminimal \ > usr.bin/clang/llvm-min-tblgen \ > @@ -3061,9 +3068,16 @@ _clang= usr.bin/clang/clang > .if ${MK_LLD_BOOTSTRAP} != "no" > _lld= usr.bin/clang/lld > .endif > -.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_LLD_BOOTSTRAP} != "no" > +.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_LLD_BOOTSTRAP} != "no" || \ > + ${MK_LLVM_BINUTILS_BOOTSTRAP} != "no" > _clang_libs= lib/clang > .endif > +.if ${MK_LLVM_BINUTILS_BOOTSTRAP}} != "no" There's a double } here making the condition always true. Can MK_LLVM_BINUTILS_BOOTSTRAP be added to MK_CROSS_COMPILER==no in share/mk/src.opts.mk?